Merge branch 'master' into desktop

.github/workflows/testpr.yml

@@ -22,7 +22,7 @@ jobs:
   build_sbc_kernel:
     name: Compile changed kernel
     # This job runs on self hosted Linux machine, with public label
-    runs-on: [self-hosted, public]
+    runs-on: [self-hosted, public, x64]
     steps:
 #      - uses: rokroskar/workflow-run-cleanup-action@v0.2.2
 #        env:

config/sources/families/include/rockchip64_common.inc

@@ -53,7 +53,7 @@ elif [[ $BOARD == rockpi-4* ]]; then
 	BOOT_USE_BLOBS=yes
 	BOOT_SUPPORT_SPI=yes
 	BOOT_SOC=rk3399
-	DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.24.bin'
+	DDR_BLOB='rk33/rk3399_ddr_933MHz_v1.20.bin' # 1GB model does not boot with later versions
 	MINILOADER_BLOB='rk33/rk3399_miniloader_v1.19.bin'
 	BL31_BLOB='rk33/rk3399_bl31_v1.30.elf'
 

lib/compilation-prepare.sh

@@ -428,7 +428,7 @@ compilation_prepare()
 
 	# Wireless drivers for Realtek 8188EU 8188EUS and 8188ETV chipsets
 
-	if linux-version compare "${version}" ge 3.14 && [ "$EXTRAWIFI" == yes ]; then
+	if linux-version compare "${version}" ge 3.14 && linux-version compare "${version}" le 5.9 && [ "$EXTRAWIFI" == yes ]; then
 
 		# attach to specifics tag or branch
 		local rtl8188euver="branch:v5.7.6.1"
@@ -460,9 +460,6 @@ compilation_prepare()
 		sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8188eu\/Kconfig"' \
 		"$kerneldir/drivers/net/wireless/Kconfig"
 
-		# kernel 5.6 ->
-		process_patch_file "${SRC}/patch/misc/wireless-rtl8188eu.patch" "applying"
-
 	fi
 
 

patch/kernel/imx6-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/imx6-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/meson-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/meson-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/meson64-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/meson64-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/meson64-dev/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/meson64-dev/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/mvebu-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/mvebu-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/mvebu-dev/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/mvebu-dev/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/mvebu64-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/mvebu64-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/mvebu64-dev/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/mvebu64-dev/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/odroidxu4-current/fix-gpio-line-names.patch

@@ -0,0 +1,285 @@
+diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+index f243adf81..ec4423ceb 100644
+--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
++++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+@@ -18,7 +18,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPY7.0", "GPY7.1", "GPY7.2", "GPY7.3", "GPY7.4", "GPY7.5", "GPY7.6", "GPY7.7";
+ 	};
+ 
+ 	gpx0: gpx0 {
+@@ -30,7 +29,6 @@
+ 		#interrupt-cells = <2>;
+ 		interrupts = <23 0>, <24 0>, <25 0>, <25 1>,
+ 			     <26 0>, <26 1>, <27 0>, <27 1>;
+-		gpio-line-names = "GPX0.0", "GPX0.1", "GPX0.2", "GPX0.3", "GPX0.4", "GPX0.5", "GPX0.6", "GPX0.7";
+ 	};
+ 
+ 	gpx1: gpx1 {
+@@ -42,7 +40,7 @@
+ 		#interrupt-cells = <2>;
+ 		interrupts = <28 0>, <28 1>, <29 0>, <29 1>,
+ 			     <30 0>, <30 1>, <31 0>, <31 1>;
+-		gpio-line-names = "GPX1.0", "GPX1.1", "GPX1.2 CONN10 PIN 15", "GPX1.3 CONN10 PIN 18", "GPX1.4", "GPX1.5 CONN10 PIN 13", "GPX1.6 CONN10 PIN 17", "GPX1.7 CONN10 PIN 25";
++		gpio-line-names = "", "", "GPX1.2 CONN10 PIN 15", "GPX1.3 CONN10 PIN 18", "", "GPX1.5 CONN10 PIN 13", "GPX1.6 CONN10 PIN 17", "GPX1.7 CONN10 PIN 25";
+ 	};
+ 
+ 	gpx2: gpx2 {
+@@ -51,7 +49,7 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPX2.0 CONN10 PIN 26", "GPX2.1 CONN10 PIN 24", "GPX2.2", "GPX2.3", "GPX2.4 CONN10 PIN 20", "GPX2.5 CONN10 PIN 21", "GPX2.6 CONN10 PIN 19", "GPX2.7 CONN10 PIN 22";
++		gpio-line-names = "GPX2.0 CONN10 PIN 26", "GPX2.1 CONN10 PIN 24", "", "", "GPX2.4 CONN10 PIN 20", "GPX2.5 CONN10 PIN 21", "GPX2.6 CONN10 PIN 19", "GPX2.7 CONN10 PIN 22";
+ 	};
+ 
+ 	gpx3: gpx3 {
+@@ -60,7 +58,7 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPX3.0", "GPX3.1 CONN10 PIN 27", "GPX3.2 CONN11 PIN 5", "GPX3.3", "GPX3.4", "GPX3.5", "GPX3.6", "GPX3.7";
++		gpio-line-names = "", "GPX3.1 CONN10 PIN 27", "GPX3.2 CONN11 PIN 5";
+ 	};
+ 
+ 	dp_hpd: dp_hpd {
+@@ -85,7 +83,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPC0.0", "GPC0.1", "GPC0.2", "GPC0.3", "GPC0.4", "GPC0.5", "GPC0.6", "GPC0.7";
+ 	};
+ 
+ 	gpc1: gpc1 {
+@@ -94,7 +91,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPC1.0", "GPC1.1", "GPC1.2", "GPC1.3", "GPC1.4", "GPC1.5", "GPC1.6", "GPC1.7";
+ 	};
+ 
+ 	gpc2: gpc2 {
+@@ -103,7 +99,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPC2.0", "GPC2.1", "GPC2.2", "GPC2.3", "GPC2.4", "GPC2.5", "GPC2.6";
+ 	};
+ 
+ 	gpc3: gpc3 {
+@@ -112,7 +107,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPC3.0", "GPC3.1", "GPC3.2", "GPC3.3";
+ 	};
+ 
+ 	gpc4: gpc4 {
+@@ -121,7 +115,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPC4.0", "GPC4.1";
+ 	};
+ 
+ 	gpd1: gpd1 {
+@@ -130,49 +123,41 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPD1.0", "GPD1.1", "GPD1.2", "GPD1.3", "GPD1.4", "GPD1.5", "GPD1.6", "GPD1.7";
+ 	};
+ 
+ 	gpy0: gpy0 {
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+-		gpio-line-names = "GPY0.0", "GPY0.1", "GPY0.2", "GPY0.3", "GPY0.4", "GPY0.5";
+ 	};
+ 
+ 	gpy1: gpy1 {
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+-		gpio-line-names = "GPY1.0", "GPY1.1", "GPY1.2", "GPY1.3";
+ 	};
+ 
+ 	gpy2: gpy2 {
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+-		gpio-line-names = "GPY2.0", "GPY2.1", "GPY2.2", "GPY2.3", "GPY2.4", "GPY2.5";
+ 	};
+ 
+ 	gpy3: gpy3 {
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+-		gpio-line-names = "GPY3.0", "GPY3.1", "GPY3.2", "GPY3.3", "GPY3.4", "GPY3.5", "GPY3.6", "GPY3.7";
+ 	};
+ 
+ 	gpy4: gpy4 {
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+-		gpio-line-names = "GPY4.0", "GPY4.1", "GPY4.2", "GPY4.3", "GPY4.4", "GPY4.5", "GPY4.6", "GPY4.7";
+ 	};
+ 
+ 	gpy5: gpy5 {
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+-		gpio-line-names = "GPY5.0", "GPY5.1", "GPY5.2", "GPY5.3", "GPY5.4", "GPY5.5", "GPY5.6", "GPY5.7";
+ 	};
+ 
+ 	gpy6: gpy6 {
+ 		gpio-controller;
+ 		#gpio-cells = <2>;
+-		gpio-line-names = "GPY6.0", "GPY6.1", "GPY6.2", "GPY6.3", "GPY6.4", "GPY6.5", "GPY6.6", "GPY6.7";
+ 	};
+ 
+ 	sd0_clk: sd0-clk {
+@@ -323,7 +308,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPE0.0", "GPE0.1", "GPE0.2", "GPE0.3", "GPE0.4", "GPE0.5", "GPE0.6", "GPE0.7";
+ 	};
+ 
+ 	gpe1: gpe1 {
+@@ -332,7 +316,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPE1.0", "GPE1.1";
+ 	};
+ 
+ 	gpf0: gpf0 {
+@@ -341,7 +324,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPF0.0", "GPF0.1", "GPF0.2", "GPF0.3", "GPF0.4", "GPF0.5";
+ 	};
+ 
+ 	gpf1: gpf1 {
+@@ -350,7 +332,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPF1.0", "GPF1.1", "GPF1.2", "GPF1.3", "GPF1.4", "GPF1.5", "GPF1.6", "GPF1.7";
+ 	};
+ 
+ 	gpg0: gpg0 {
+@@ -359,7 +340,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPG0.0", "GPG0.1", "GPG0.2", "GPG0.3", "GPG0.4", "GPG0.5", "GPG0.6", "GPG0.7";
+ 	};
+ 
+ 	gpg1: gpg1 {
+@@ -368,7 +348,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPG1.0", "GPG1.1", "GPG1.2", "GPG1.3", "GPG1.4", "GPG1.5", "GPG1.6", "GPG1.7";
+ 	};
+ 
+ 	gpg2: gpg2 {
+@@ -377,7 +356,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPG2.0", "GPG2.1";
+ 	};
+ 
+ 	gpj4: gpj4 {
+@@ -386,7 +364,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPJ4.0", "GPJ4.1", "GPJ4.2", "GPJ4.3";
+ 	};
+ 
+ 	cam_gpio_a: cam-gpio-a {
+@@ -460,7 +437,7 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPA0.0 CONN10 PIN 6", "GPA0.1 CONN10 PIN 8", "GPA0.2 CONN10 PIN 4", "GPA0.3 CONN10 PIN 5", "GPA0.4", "GPA0.5", "GPA0.6", "GPA0.7";
++		gpio-line-names = "GPA0.0 CONN10 PIN 6", "GPA0.1 CONN10 PIN 8", "GPA0.2 CONN10 PIN 4", "GPA0.3 CONN10 PIN 5";
+ 	};
+ 
+ 	gpa1: gpa1 {
+@@ -469,7 +446,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPA1.0", "GPA1.1", "GPA1.2", "GPA1.3", "GPA1.4", "GPA1.5";
+ 	};
+ 
+ 	gpa2: gpa2 {
+@@ -478,7 +454,7 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPA2.0", "GPA2.1", "GPA2.2 CONN11 PIN 4", "GPA2.3 CONN11 PIN 6", "GPA2.4 CONN10 PIN 10", "GPA2.5 CONN10 PIN 11", "GPA2.6 CONN10 PIN 9", "GPA2.7 CONN10 PIN 7";
++		gpio-line-names = "", "", "GPA2.2 CONN11 PIN 4", "GPA2.3 CONN11 PIN 6", "GPA2.4 CONN10 PIN 10", "GPA2.5 CONN10 PIN 11", "GPA2.6 CONN10 PIN 9", "GPA2.7 CONN10 PIN 7";
+ 	};
+ 
+ 	gpb0: gpb0 {
+@@ -487,7 +463,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPB0.0", "GPB0.1", "GPB0.2", "GPB0.3", "GPB0.4";
+ 	};
+ 
+ 	gpb1: gpb1 {
+@@ -496,7 +471,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPB1.0", "GPB1.1", "GPB1.2", "GPB1.3", "GPB1.4", "GPB1.5", "GPB1.6", "GPB1.7";
+ 	};
+ 
+ 	gpb2: gpb2 {
+@@ -505,7 +479,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPB2.0", "GPB2.1", "GPB2.2", "GPB2.3";
+ 	};
+ 
+ 	gpb3: gpb3 {
+@@ -514,7 +487,7 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPB3.0", "GPB3.1", "GPB3.2 CONN10 PIN 16", "GPB3.3 CONN10 PIN 14", "GPB3.4", "GPB3.5", "GPB3.6", "GPB3.7";
++		gpio-line-names = "", "", "GPB3.2 CONN10 PIN 16", "GPB3.3 CONN10 PIN 14";
+ 	};
+ 
+ 	gpb4: gpb4 {
+@@ -523,7 +496,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPB4.0", "GPB4.1";
+ 	};
+ 
+ 	gph0: gph0 {
+@@ -532,7 +504,6 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPH0.0", "GPH0.1", "GPH0.2", "GPH0.3", "GPH0.4", "GPH0.5", "GPH0.6", "GPH0.7";
+ 	};
+ 
+ 	uart0_data: uart0-data {
+@@ -757,7 +728,7 @@
+ 
+ 		interrupt-controller;
+ 		#interrupt-cells = <2>;
+-		gpio-line-names = "GPZ.0 CONN11 PIN 7", "GPZ.1 CONN11 PIN 9", "GPZ.2 CONN11 PIN 11", "GPZ.3 CONN11 PIN 12", "GPZ.4 CONN11 PIN 10", "GPZ.5", "GPZ.6";
++		gpio-line-names = "GPZ.0 CONN11 PIN 7", "GPZ.1 CONN11 PIN 9", "GPZ.2 CONN11 PIN 11", "GPZ.3 CONN11 PIN 12", "GPZ.4 CONN11 PIN 10";
+ 	};
+ 
+ 	i2s0_bus: i2s0-bus {

patch/kernel/odroidxu4-dev/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/odroidxu4-dev/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/rk322x-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/rk322x-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/rk322x-dev/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/rk322x-dev/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/rockchip-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/rockchip-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/rockchip-dev/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/rockchip-dev/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/rockchip64-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/rockchip64-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/rockchip64-dev/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/rockchip64-dev/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/sunxi-current/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/sunxi-current/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/kernel/sunxi-dev/wifi-4003-fix-sha256_state-clashes.patch

@@ -60,65 +60,3 @@ index b537a26..f8c42f4 100755
  	size_t i;
  
  	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8188eu/include/rtw_security.h b/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-index 0adc700..2a9cf9d 100644
---- a/drivers/net/wireless/rtl8188eu/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8188eu/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/rtl8188eu/core/rtw_security.c b/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-index 5807521..0b3eed2 100644
---- a/drivers/net/wireless/rtl8188eu/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8188eu/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);

patch/kernel/sunxi-dev/wifi-4004-fix-cfg80211-for-5.8.patch

@@ -57,62 +57,3 @@ index c0df148..9bff924 100755
  #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
  	.action = cfg80211_rtw_mgmt_tx,
  #endif
-diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-index 721723e..62fd530 100644
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c
-@@ -7470,6 +7470,33 @@ exit:
- 	return ret;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+
-+static void
-+cfg80211_rtw_update_mgmt_frame_registrations(struct wiphy *wiphy,
-+					     struct wireless_dev *wdev,
-+					     struct mgmt_frame_regs *upd)
-+{
-+	struct net_device *ndev = wdev_to_ndev(wdev);
-+	struct rtw_wdev_priv *pwdev_priv;
-+	_adapter *adapter;
-+
-+	if (ndev == NULL)
-+		return;
-+
-+	adapter = (_adapter *)rtw_netdev_priv(ndev);
-+	pwdev_priv = adapter_wdev_data(adapter);
-+
-+#ifdef CONFIG_DEBUG_CFG80211
-+	RTW_INFO(FUNC_ADPT_FMT" stypes:%x\n", FUNC_ADPT_ARG(adapter),
-+		 upd->interface_stypes);
-+#endif
-+
-+	/* not implemented, see bellow */
-+}
-+
-+#else
-+
- static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- 	struct wireless_dev *wdev,
-@@ -7525,6 +7552,8 @@ exit:
- 	return;
- }
- 
-+#endif
-+
- #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
- static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
- 	struct net_device *ndev,
-@@ -9903,7 +9932,11 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
- 
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
- 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-+	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_registrations,
-+#else
- 	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
-+#endif
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
- 	.action = cfg80211_rtw_mgmt_tx,
- #endif

patch/misc/wireless-rtl8188eu.patch

@@ -1,148 +0,0 @@
---- a/drivers/net/wireless/rtl8188eu/os_dep/linux/rtw_proc.c
-+++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/rtw_proc.c
-@@ -61,8 +61,14 @@
- 	return entry;
- }
- 
--inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent,
--	const struct file_operations *fops, void * data)
-+inline struct proc_dir_entry *rtw_proc_create_entry(const char *name,
-+						    struct proc_dir_entry *parent,
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
-+	const struct proc_ops *fops,
-+#else
-+	const struct file_operations *fops,
-+#endif
-+	void * data)
- {
- 	struct proc_dir_entry *entry;
- 
-@@ -238,6 +244,15 @@
- 	return -EROFS;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
-+static const struct proc_ops rtw_drv_proc_seq_fops = {
-+	.proc_open = rtw_drv_proc_open,
-+	.proc_read = seq_read,
-+	.proc_lseek = seq_lseek,
-+	.proc_release = seq_release,
-+	.proc_write = rtw_drv_proc_write,
-+};
-+#else
- static const struct file_operations rtw_drv_proc_seq_fops = {
- 	.owner = THIS_MODULE,
- 	.open = rtw_drv_proc_open,
-@@ -246,7 +261,17 @@
- 	.release = seq_release,
- 	.write = rtw_drv_proc_write,
- };
--
-+#endif
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
-+static const struct proc_ops rtw_drv_proc_sseq_fops = {
-+	.proc_open = rtw_drv_proc_open,
-+	.proc_read = seq_read,
-+	.proc_lseek = seq_lseek,
-+	.proc_release = single_release,
-+	.proc_write = rtw_drv_proc_write,
-+};
-+#else
- static const struct file_operations rtw_drv_proc_sseq_fops = {
- 	.owner = THIS_MODULE,
- 	.open = rtw_drv_proc_open,
-@@ -255,6 +280,7 @@
- 	.release = single_release,
- 	.write = rtw_drv_proc_write,
- };
-+#endif
- 
- int rtw_drv_proc_init(void)
- {
-@@ -4394,6 +4420,15 @@
- 	return -EROFS;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
-+static const struct proc_ops rtw_adapter_proc_seq_fops = {
-+	.proc_open = rtw_adapter_proc_open,
-+	.proc_read = seq_read,
-+	.proc_lseek = seq_lseek,
-+	.proc_release = seq_release,
-+	.proc_write = rtw_adapter_proc_write,
-+};
-+#else
- static const struct file_operations rtw_adapter_proc_seq_fops = {
- 	.owner = THIS_MODULE,
- 	.open = rtw_adapter_proc_open,
-@@ -4402,7 +4437,17 @@
- 	.release = seq_release,
- 	.write = rtw_adapter_proc_write,
- };
--
-+#endif
-+
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
-+static const struct proc_ops rtw_adapter_proc_sseq_fops = {
-+	.proc_open = rtw_adapter_proc_open,
-+	.proc_read = seq_read,
-+	.proc_lseek = seq_lseek,
-+	.proc_release = single_release,
-+	.proc_write = rtw_adapter_proc_write,
-+};
-+#else
- static const struct file_operations rtw_adapter_proc_sseq_fops = {
- 	.owner = THIS_MODULE,
- 	.open = rtw_adapter_proc_open,
-@@ -4411,6 +4456,7 @@
- 	.release = single_release,
- 	.write = rtw_adapter_proc_write,
- };
-+#endif
- 
- int proc_get_odm_adaptivity(struct seq_file *m, void *v)
- {
-@@ -4563,6 +4609,15 @@
- 	return -EROFS;
- }
- 
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
-+static const struct proc_ops rtw_odm_proc_seq_fops = {
-+	.proc_open = rtw_odm_proc_open,
-+	.proc_read = seq_read,
-+	.proc_lseek = seq_lseek,
-+	.proc_release = seq_release,
-+	.proc_write = rtw_odm_proc_write,
-+};
-+#else
- static const struct file_operations rtw_odm_proc_seq_fops = {
- 	.owner = THIS_MODULE,
- 	.open = rtw_odm_proc_open,
-@@ -4571,7 +4626,16 @@
- 	.release = seq_release,
- 	.write = rtw_odm_proc_write,
- };
--
-+#endif
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
-+static const struct proc_ops rtw_odm_proc_sseq_fops = {
-+	.proc_open = rtw_odm_proc_open,
-+	.proc_read = seq_read,
-+	.proc_lseek = seq_lseek,
-+	.proc_release = single_release,
-+	.proc_write = rtw_odm_proc_write,
-+};
-+#else
- static const struct file_operations rtw_odm_proc_sseq_fops = {
- 	.owner = THIS_MODULE,
- 	.open = rtw_odm_proc_open,
-@@ -4580,6 +4644,7 @@
- 	.release = single_release,
- 	.write = rtw_odm_proc_write,
- };
-+#endif
- 
- struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev)
- {
-