Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtl8189es: bump to latest git HEAD

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-09-20 18:51:12 +08:00
parent f28e232554
commit b62af9176e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 16 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/kernel/rtl8189es/Makefile
View File

@ -5,15 +5,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=rtl8189es PKG_NAME:=rtl8189es
PKG_RELEASE:=3 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:=2022-10-30 PKG_SOURCE_DATE:=2023-07-09
PKG_SOURCE_VERSION:=e58bd86c9d9408c648b1246a0dd76b16856ec172 PKG_SOURCE_VERSION:=05996691a5f3a61968a83f8b368454fd2c6885ca
PKG_MIRROR_HASH:=1e4acfd7d1f1f2490b6778068f97e7a63b81575dffd98c93e84cecb287e2c7ad PKG_MIRROR_HASH:=a9dce6590721613db1756810fb8bd1e97e05d48003cf815a45ac4be3f20f1c7d
PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h

62
package/kernel/rtl8189es/patches/020-wireless-5.8.patch
View File

@ -1,26 +1,15 @@
--- a/include/osdep_service_linux.h
+++ b/include/osdep_service_linux.h
@@ -220,7 +220,7 @@ typedef void *timer_hdl_context;
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
#endif
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0) && !defined(BUILD_OPENWRT))
/* Porting from linux kernel commits
48eab831ae8b9f7002a533fa4235eed63ea1f1a3
3f6cffb8604b537e3d7ea040d7f4368689638eaf
--- 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,7 +438,7 @@ 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(5,19, 2)) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2) || defined(BUILD_OPENWRT)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,3, 0) || defined(BUILD_OPENWRT))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19, 2))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
#else @@ -1114,7 +1114,7 @@ check_bss:
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
@@ -1112,7 +1112,7 @@ check_bss:
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
@ -29,7 +18,7 @@
roam_info.links[0].bssid = cur_network->network.MacAddress; roam_info.links[0].bssid = cur_network->network.MacAddress;
#else #else
roam_info.bssid = cur_network->network.MacAddress; roam_info.bssid = cur_network->network.MacAddress;
@@ -1679,7 +1679,7 @@ exit: @@ -1681,7 +1681,7 @@ exit:
} }
static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev
@ -38,7 +27,7 @@
,int link_id ,int link_id
#endif #endif
, u8 key_index , u8 key_index
@@ -1826,7 +1826,7 @@ addkey_end: @@ -1828,7 +1828,7 @@ addkey_end:
} }
static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
@ -47,7 +36,7 @@
,int link_id ,int link_id
#endif #endif
, u8 keyid , u8 keyid
@@ -1994,7 +1994,7 @@ exit: @@ -1996,7 +1996,7 @@ exit:
} }
static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
@ -56,7 +45,7 @@
int link_id, int link_id,
#endif #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
@@ -2018,7 +2018,7 @@ static int cfg80211_rtw_del_key(struct w @@ -2020,7 +2020,7 @@ static int cfg80211_rtw_del_key(struct w
static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
struct net_device *ndev, struct net_device *ndev,
@ -65,7 +54,7 @@
int link_id, int link_id,
#endif #endif
u8 key_index u8 key_index
@@ -2070,7 +2070,7 @@ static int cfg80211_rtw_set_default_key( @@ -2072,7 +2072,7 @@ static int cfg80211_rtw_set_default_key(
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30))
int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy, int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy,
struct net_device *ndev, struct net_device *ndev,
@ -74,7 +63,7 @@
int link_id, int link_id,
#endif #endif
u8 key_index) u8 key_index)
@@ -5158,7 +5158,7 @@ static int cfg80211_rtw_change_beacon(st @@ -5160,7 +5160,7 @@ static int cfg80211_rtw_change_beacon(st
return ret; return ret;
} }
@ -83,34 +72,7 @@
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id) static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
#else #else
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
@@ -7609,7 +7609,7 @@ static void cfg80211_rtw_mgmt_frame_regi @@ -10263,7 +10263,7 @@ void rtw_wdev_unregister(struct wireless
#else
struct net_device *ndev,
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) || defined(BUILD_OPENWRT))
struct mgmt_frame_regs *upd)
#else
u16 frame_type, bool reg)
@@ -7619,7 +7619,7 @@ static void cfg80211_rtw_mgmt_frame_regi
struct net_device *ndev = wdev_to_ndev(wdev);
#endif
_adapter *adapter;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) || defined(BUILD_OPENWRT))
u16 frame_type = BIT(upd->global_stypes << 4);
bool reg = false;
#endif
@@ -10047,7 +10047,7 @@ static struct cfg80211_ops rtw_cfg80211_
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
.action = cfg80211_rtw_mgmt_tx,
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) || defined(BUILD_OPENWRT))
.update_mgmt_frame_registrations = cfg80211_rtw_mgmt_frame_register,
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
@@ -10261,7 +10261,7 @@ void rtw_wdev_unregister(struct wireless
rtw_cfg80211_indicate_scan_done(adapter, _TRUE); 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(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)