diff --git a/lib/compilation-prepare.sh b/lib/compilation-prepare.sh
index 00ef2f07ba..2d693fbe93 100644
--- a/lib/compilation-prepare.sh
+++ b/lib/compilation-prepare.sh
@@ -455,6 +455,7 @@ compilation_prepare()
 
 		# add support for K5.12+
 		process_patch_file "${SRC}/patch/misc/wireless-realtek-8811cu-5.12.patch" "applying"
+		process_patch_file "${SRC}/patch/misc/wireless-realtek-8811cu-xxx.patch" "applying"
 
 	fi
 
diff --git a/patch/kernel/archive/imx6-5.12/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/imx6-5.12/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/imx6-5.12/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/imx6-5.13/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/imx6-5.13/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/imx6-5.13/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/meson-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/meson-5.10/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/meson-5.10/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/meson64-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/meson64-5.10/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/meson64-5.10/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/meson64-5.11/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/meson64-5.11/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/meson64-5.11/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/meson64-5.12/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/meson64-5.12/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/meson64-5.12/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/meson64-5.13/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/meson64-5.13/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/meson64-5.13/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/meson64-5.14/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/meson64-5.14/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/meson64-5.14/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/mvebu-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/mvebu-5.10/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/mvebu-5.10/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/mvebu-5.11/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/mvebu-5.11/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/mvebu-5.11/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/mvebu-5.12/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/mvebu-5.12/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/mvebu-5.12/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/mvebu64-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/mvebu64-5.10/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/mvebu64-5.10/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/odroidxu4-5.12/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/odroidxu4-5.12/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/odroidxu4-5.12/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/odroidxu4-5.13/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/odroidxu4-5.13/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/odroidxu4-5.13/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rk322x-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rk322x-5.10/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rk322x-5.10/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rk322x-5.14/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rk322x-5.14/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rk322x-5.14/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rockchip-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rockchip-5.10/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rockchip-5.10/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rockchip-5.11/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rockchip-5.11/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rockchip-5.11/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rockchip-5.13/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rockchip-5.13/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rockchip-5.13/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rockchip-5.14/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rockchip-5.14/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rockchip-5.14/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rockchip64-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rockchip64-5.10/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rockchip64-5.10/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rockchip64-5.12/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rockchip64-5.12/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rockchip64-5.12/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rockchip64-5.13/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rockchip64-5.13/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rockchip64-5.13/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/rockchip64-5.14/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/rockchip64-5.14/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/rockchip64-5.14/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/sunxi-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/sunxi-5.10/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/sunxi-5.10/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/sunxi-5.11/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/sunxi-5.11/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/sunxi-5.11/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/sunxi-5.12/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/sunxi-5.12/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/sunxi-5.12/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/sunxi-5.13/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/sunxi-5.13/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/sunxi-5.13/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/sunxi-5.14/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/archive/sunxi-5.14/wifi-4003-fix-sha256_state-clashes.patch
deleted file mode 100644
index d2b82f1c11..0000000000
--- a/patch/kernel/archive/sunxi-5.14/wifi-4003-fix-sha256_state-clashes.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/drivers/net/wireless/rtl8811cu/include/rtw_security.h b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-index ac8432e..5f74fb7 100755
---- a/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8811cu/include/rtw_security.h
-@@ -249,7 +249,7 @@ struct security_priv {
- #define SEC_IS_BIP_KEY_INSTALLED(sec) _FALSE
- #endif
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8811cu/core/rtw_security.c b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-index b537a26..f8c42f4 100755
---- a/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8811cu/core/rtw_security.c
-@@ -2133,7 +2133,7 @@ BIP_exit:
- #ifndef PLATFORM_FREEBSD
- #if defined(CONFIG_TDLS)
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -2181,7 +2181,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- }
- 
- /* Initialize the hash state */
--static void sha256_init(struct sha256_state *md)
-+static void sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -2202,7 +2202,7 @@ static void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--static int sha256_process(struct sha256_state *md, unsigned char *in,
-+static int sha256_process(struct rtl_sha256_state *md, unsigned char *in,
- 			  unsigned long inlen)
- {
- 	unsigned long n;
-@@ -2243,7 +2243,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--static int sha256_done(struct sha256_state *md, unsigned char *out)
-+static int sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-@@ -2293,7 +2293,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	sha256_init(&ctx);
diff --git a/patch/kernel/archive/imx6-5.10/wifi-4003-fix-sha256_state-clashes.patch b/patch/misc/wireless-realtek-8811cu-xxx.patch
similarity index 100%
rename from patch/kernel/archive/imx6-5.10/wifi-4003-fix-sha256_state-clashes.patch
rename to patch/misc/wireless-realtek-8811cu-xxx.patch