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

rtl88x2bu: fix build on kernel 4.9

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-05-27 16:58:57 +08:00
parent bd501b42e7
commit e717229d7f
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 64 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/kernel/rtl88x2bu/Makefile
View File

@ -1,15 +1,11 @@
# SPDX-License-Identifier: GPL-3.0-only
#
# Copyright (C) 2021 ImmortalWrt
# <https://immortalwrt.org>
#
# This is free software, licensed under the GNU General Public License v3.
# See /LICENSE for more information.
#
# Copyright (C) 2021 ImmortalWrt.org
include $(TOPDIR)/rules.mk
PKG_NAME:=rtl88x2bu
PKG_RELEASE:=1
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_URL:=https://github.com/morrownr/88x2bu.git
PKG_SOURCE_PROTO:=git

61
package/kernel/rtl88x2bu/patches/030-fix-build-newer-k4.9.patch Normal file
View File

@ -0,0 +1,61 @@
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
index 10c30d7..3f74e6f 100644
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@@ -1086,7 +1086,7 @@ int rtw_cfg80211_indicate_connect(_adapter *padapter)
#ifdef CONFIG_P2P
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)
struct cfg80211_roam_info roam_info ={};
#endif
@@ -1170,7 +1170,7 @@ check_bss:
notify_channel = ieee80211_get_channel(wiphy, freq);
#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)
roam_info.bssid = cur_network->network.MacAddress;
roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2;
roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2;
@@ -1189,7 +1189,7 @@ check_bss:
, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
, GFP_ATOMIC);
- #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)*/
+ #endif /*LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)*/
RTW_INFO(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
@@ -2379,7 +2379,8 @@ enum nl80211_iftype {
static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
struct net_device *ndev,
enum nl80211_iftype type,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \
+ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)
u32 *flags,
#endif
struct vif_params *params)
@@ -4983,7 +4984,8 @@ static int
unsigned char name_assign_type,
#endif
enum nl80211_iftype type,
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0))
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \
+ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)
u32 *flags,
#endif
struct vif_params *params)
@@ -9866,7 +9868,8 @@ static void rtw_cfg80211_preinit_wiphy(_adapter *adapter, struct wiphy *wiphy)
#endif
#if defined(CONFIG_PM) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) && \
- LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0))
+ LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) && \
+ !LINUX_VERSION_IN_RANGE(4, 9, 255, 4, 10, 0)
wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
#ifdef CONFIG_PNO_SUPPORT
wiphy->max_sched_scan_ssids = MAX_PNO_LIST_COUNT;