diff --git a/package/kernel/rtl8189es/Makefile b/package/kernel/rtl8189es/Makefile
index 186512f2d2..e3fa8ceea5 100644
--- a/package/kernel/rtl8189es/Makefile
+++ b/package/kernel/rtl8189es/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=https://github.com/jwrdegoede/rtl8189ES_linux.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2023-07-09
-PKG_SOURCE_VERSION:=05996691a5f3a61968a83f8b368454fd2c6885ca
-PKG_MIRROR_HASH:=fc36c98aa564fde8c97928e2f0cc7d89c0917ee19331afc636f4ffecf84ad9a1
+PKG_SOURCE_DATE:=2024-05-19
+PKG_SOURCE_VERSION:=30a52f789a0b933c4a7eb06cbf4a4d21c8e581aa
+PKG_MIRROR_HASH:=c2be9cc6f1910ba2a1ce6870eba52865caf0e2617cfceb3ad96919f025ef5f28
 
 PKG_BUILD_PARALLEL:=1
 
diff --git a/package/kernel/rtl8189es/patches/020-wireless-5.8.patch b/package/kernel/rtl8189es/patches/020-wireless-5.8.patch
index 048be18882..b853d22607 100644
--- a/package/kernel/rtl8189es/patches/020-wireless-5.8.patch
+++ b/package/kernel/rtl8189es/patches/020-wireless-5.8.patch
@@ -1,20 +1,23 @@
 --- a/os_dep/linux/ioctl_cfg80211.c
 +++ b/os_dep/linux/ioctl_cfg80211.c
-@@ -438,7 +438,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte
+@@ -438,9 +438,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte
  	ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht);
  	if (ret != _SUCCESS)
  		goto exit;
--#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0) || defined(BUILD_OPENWRT))
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) && !defined(BUILD_OPENWRT)
  	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
- #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
+-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) || defined(BUILD_OPENWRT)
  	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
+ #else
+ 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
 @@ -1114,7 +1114,7 @@ check_bss:
  		#endif
  
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) || defined(BUILD_OPENWRT))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0)) || defined(BUILD_OPENWRT)
  		roam_info.links[0].bssid = cur_network->network.MacAddress;
  #else
  		roam_info.bssid = cur_network->network.MacAddress;
@@ -23,7 +26,7 @@
  
  static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev
 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
  	,int link_id
  #endif
  	, u8 key_index
@@ -32,7 +35,7 @@
  
  static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
  	,int link_id
  #endif
  	, u8 keyid
@@ -41,7 +44,7 @@
  
  static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
  	int link_id,
  #endif
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
@@ -50,7 +53,7 @@
  static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
  	struct net_device *ndev, 
 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
  	int link_id,
  #endif	 	
  	u8 key_index
@@ -59,25 +62,34 @@
  int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy,
  	struct net_device *ndev, 
 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(BUILD_OPENWRT))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) || defined(BUILD_OPENWRT)
  	int link_id,
  #endif	
  	u8 key_index)
-@@ -5160,7 +5160,7 @@ static int cfg80211_rtw_change_beacon(st
+@@ -5148,7 +5148,7 @@ exit:
+ 	return ret;
+ }
+ 
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) || defined(BUILD_OPENWRT)
+ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
+ 		struct cfg80211_ap_update *params)
+ {
+@@ -5167,7 +5167,7 @@ static int cfg80211_rtw_change_beacon(st
  
  	return ret;
  }
 -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2) || defined(BUILD_OPENWRT))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) || defined(BUILD_OPENWRT)
  static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
  #else
  static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
-@@ -10263,7 +10263,7 @@ void rtw_wdev_unregister(struct wireless
+@@ -10270,7 +10270,7 @@ void rtw_wdev_unregister(struct wireless
  	rtw_cfg80211_indicate_scan_done(adapter, _TRUE);
  
  	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)
 -	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
-+	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2) || defined(BUILD_OPENWRT))
++	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2)) || defined(BUILD_OPENWRT)
  	if (wdev->connected) {
  	#else
  	if (wdev->current_bss) {