diff --git a/patch/kernel/rockchip64-current/wifi-4003-fix-sha256_state-clashes.patch b/patch/kernel/rockchip64-current/wifi-4003-fix-sha256_state-clashes.patch
index f528e5c59..0dce511a1 100644
--- a/patch/kernel/rockchip64-current/wifi-4003-fix-sha256_state-clashes.patch
+++ b/patch/kernel/rockchip64-current/wifi-4003-fix-sha256_state-clashes.patch
@@ -245,66 +245,4 @@ index b537a26..f8c42f4 100644
 +	struct rtl_sha256_state ctx;
  	size_t i;
  
- 	sha256_init(&ctx);
-diff --git a/drivers/net/wireless/rtl8723ds/include/rtw_security.h b/drivers/net/wireless/rtl8723ds/include/rtw_security.h
-index 83c06a5..bcea21a 100644
---- a/drivers/net/wireless/rtl8723ds/include/rtw_security.h
-+++ b/drivers/net/wireless/rtl8723ds/include/rtw_security.h
-@@ -242,7 +242,7 @@ struct security_priv {
- #endif /* DBG_SW_SEC_CNT */
- };
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[64];
-diff --git a/drivers/net/wireless/rtl8723ds/core/rtw_security.c b/drivers/net/wireless/rtl8723ds/core/rtw_security.c
-index 88033df..11aa9a4 100644
---- a/drivers/net/wireless/rtl8723ds/core/rtw_security.c
-+++ b/drivers/net/wireless/rtl8723ds/core/rtw_security.c
-@@ -2132,7 +2132,7 @@ BIP_exit:
- #endif /* CONFIG_IEEE80211W */
- 
- /* 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;
-@@ -2180,7 +2180,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;
-@@ -2201,7 +2201,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;
-@@ -2242,7 +2242,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;
- 
-@@ -2292,7 +2292,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out)
- static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len,
- 			 u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
  	sha256_init(&ctx);
diff --git a/patch/kernel/rockchip64-current/wifi-4004-fix-cfg80211-for-5.8.patch b/patch/kernel/rockchip64-current/wifi-4004-fix-cfg80211-for-5.8.patch
index b9d8f8c7f..587d60460 100644
--- a/patch/kernel/rockchip64-current/wifi-4004-fix-cfg80211-for-5.8.patch
+++ b/patch/kernel/rockchip64-current/wifi-4004-fix-cfg80211-for-5.8.patch
@@ -234,62 +234,3 @@ index 2fd4e28..b463e55 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/rtl8723ds/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8723ds/os_dep/linux/ioctl_cfg80211.c
-index 564c2c5..921a452 100644
---- a/drivers/net/wireless/rtl8723ds/os_dep/linux/ioctl_cfg80211.c
-+++ b/drivers/net/wireless/rtl8723ds/os_dep/linux/ioctl_cfg80211.c
-@@ -5872,6 +5872,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,
-@@ -5916,6 +5943,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,
-@@ -6866,7 +6895,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