anthony
/
rtl8812au
mirror of https://github.com/aircrack-ng/rtl8812au
1
0
Fork 0
Code Releases Activity

Compare commits

base: anthony:9dc4a4c9a2637df74692542aa01ba63f6fad6f5a
Branches Tags
anthony:v5.6.4.2
anthony:v5.13.6
anthony:v4.3.21
anthony:v5.3.4
anthony:v5.1.5
anthony:v5.2.20
anthony:v5.6.4
anthony:v5.2.9
anthony:v1.0-DEV
...
compare: anthony:a842611d74c776749782650d225137e9dbb3ba43
Branches Tags
anthony:v5.6.4.2
anthony:v5.13.6
anthony:v4.3.21
anthony:v5.3.4
anthony:v5.1.5
anthony:v5.2.20
anthony:v5.6.4
anthony:v5.2.9
anthony:v1.0-DEV

2 Commits
9dc4a4c9a2 ... a842611d74

Author SHA1 Message Date
Christian Bremvåg a842611d74
Merge pull request #1092 from paralin/fix-kernel-4.9 
ioctl_cfg80211: fix build against kernels < 4.10.x
 2023-07-08 16:31:34 +02:00
Christian Stewart d00db12afc ioctl_cfg80211: fix build against kernels < 4.10.x 
Kernel 4.10.x adjusted cfg80211_connect_bss to accept a timeout as the last
argument. Add a conditional statement which removes this extra parameter if the
kernel is less than version 4.10.x to fix build errors against version 4.9.x.

Note that the Jetson TX2 kernel is still version 4.9.x even though this version
is technically deprecated upstream.

Signed-off-by: Christian Stewart <christian@aperture.us>
 2023-07-03 13:54:27 -07:00
1 changed files with 10 additions and 0 deletions
Show Stats Expand all files Collapse all files

10
os_dep/linux/ioctl_cfg80211.c
View File

@ -1193,12 +1193,22 @@ check_bss:
struct cfg80211_bss *bss;
bss = cfg80211_get_bss(pwdev->wiphy, NULL, cur_network->network.MacAddress, NULL, 0,
IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
cfg80211_connect_bss(wdev_to_ndev(pwdev), cur_network->network.MacAddress, bss
, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
, WLAN_STATUS_SUCCESS, GFP_ATOMIC, NL80211_TIMEOUT_UNSPECIFIED);
#else // (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
// Linux < 4.10.x does not accept the last argument (timeout).
cfg80211_connect_bss(wdev_to_ndev(pwdev), cur_network->network.MacAddress, bss
, pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2
, pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2
, pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6
, pmlmepriv->assoc_rsp_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 6
, WLAN_STATUS_SUCCESS, GFP_ATOMIC);
#endif
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 11, 0) || defined(COMPAT_KERNEL_RELEASE)
RTW_INFO("pwdev->sme_state(a)=%d\n", pwdev->sme_state);