mirror of
https://github.com/immortalwrt/immortalwrt.git
synced 2025-08-11 06:11:53 +08:00
rtl8189es: bump to latest git HEAD
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
@ -9,9 +9,9 @@ PKG_RELEASE:=1
|
|||||||
|
|
||||||
PKG_SOURCE_URL:=https://github.com/jwrdegoede/rtl8189ES_linux.git
|
PKG_SOURCE_URL:=https://github.com/jwrdegoede/rtl8189ES_linux.git
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_DATE:=2024-05-19
|
PKG_SOURCE_DATE:=2025-06-21
|
||||||
PKG_SOURCE_VERSION:=30a52f789a0b933c4a7eb06cbf4a4d21c8e581aa
|
PKG_SOURCE_VERSION:=07f03cf721f5e0317012ece4159834327680ba8b
|
||||||
PKG_MIRROR_HASH:=c2be9cc6f1910ba2a1ce6870eba52865caf0e2617cfceb3ad96919f025ef5f28
|
PKG_MIRROR_HASH:=ee990e83859bbc3ee16bd2b7d739e7184fb10147e0675ba71c0aef96f2e6fd01
|
||||||
|
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_PARALLEL:=1
|
||||||
|
|
||||||
|
@ -1,72 +1,24 @@
|
|||||||
--- a/os_dep/linux/ioctl_cfg80211.c
|
--- a/os_dep/linux/ioctl_cfg80211.c
|
||||||
+++ b/os_dep/linux/ioctl_cfg80211.c
|
+++ b/os_dep/linux/ioctl_cfg80211.c
|
||||||
@@ -438,9 +438,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte
|
@@ -438,7 +438,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte
|
||||||
ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht);
|
ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht);
|
||||||
if (ret != _SUCCESS)
|
if (ret != _SUCCESS)
|
||||||
goto exit;
|
goto exit;
|
||||||
-#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))
|
||||||
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 9, 0)) && !defined(BUILD_OPENWRT)
|
+#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);
|
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);
|
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
|
||||||
#else
|
@@ -4223,7 +4223,7 @@ static int cfg80211_rtw_get_txpower(stru
|
||||||
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
|
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||||
@@ -1114,7 +1114,7 @@ check_bss:
|
struct wireless_dev *wdev,
|
||||||
#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)
|
|
||||||
roam_info.links[0].bssid = cur_network->network.MacAddress;
|
|
||||||
#else
|
|
||||||
roam_info.bssid = cur_network->network.MacAddress;
|
|
||||||
@@ -1681,7 +1681,7 @@ exit:
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
,int link_id
|
|
||||||
#endif
|
#endif
|
||||||
, u8 key_index
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0))
|
||||||
@@ -1828,7 +1828,7 @@ addkey_end:
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)) || defined(BUILD_OPENWRT)
|
||||||
}
|
unsigned int link_id,
|
||||||
|
|
||||||
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)
|
|
||||||
,int link_id
|
|
||||||
#endif
|
#endif
|
||||||
, u8 keyid
|
int *dbm)
|
||||||
@@ -1996,7 +1996,7 @@ exit:
|
@@ -5151,7 +5151,7 @@ exit:
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
int link_id,
|
|
||||||
#endif
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|
|
||||||
@@ -2020,7 +2020,7 @@ static int cfg80211_rtw_del_key(struct w
|
|
||||||
|
|
||||||
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)
|
|
||||||
int link_id,
|
|
||||||
#endif
|
|
||||||
u8 key_index
|
|
||||||
@@ -2072,7 +2072,7 @@ static int cfg80211_rtw_set_default_key(
|
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30))
|
|
||||||
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)
|
|
||||||
int link_id,
|
|
||||||
#endif
|
|
||||||
u8 key_index)
|
|
||||||
@@ -5148,7 +5148,7 @@ exit:
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -75,31 +27,12 @@
|
|||||||
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
|
||||||
struct cfg80211_ap_update *params)
|
struct cfg80211_ap_update *params)
|
||||||
{
|
{
|
||||||
@@ -5167,7 +5167,7 @@ static int cfg80211_rtw_change_beacon(st
|
@@ -6081,7 +6081,7 @@ static int cfg80211_rtw_set_channel(stru
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
|
|
||||||
+#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)
|
|
||||||
@@ -6078,6 +6078,9 @@ static int cfg80211_rtw_set_channel(stru
|
|
||||||
#endif /*#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))*/
|
#endif /*#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))*/
|
||||||
|
|
||||||
static int cfg80211_rtw_set_monitor_channel(struct wiphy *wiphy
|
static int cfg80211_rtw_set_monitor_channel(struct wiphy *wiphy
|
||||||
+#ifdef BUILD_OPENWRT
|
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0))
|
||||||
+ , struct net_device *dev
|
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0)) || defined(BUILD_OPENWRT)
|
||||||
+#endif
|
, struct net_device *dev
|
||||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
|
||||||
, struct cfg80211_chan_def *chandef
|
, struct cfg80211_chan_def *chandef
|
||||||
#else
|
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
|
||||||
@@ -10270,7 +10273,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 (wdev->connected) {
|
|
||||||
#else
|
|
||||||
if (wdev->current_bss) {
|
|
||||||
|
Reference in New Issue
Block a user