mirror of
https://github.com/aircrack-ng/rtl8812au.git
synced 2024-12-29 01:08:47 +00:00
Merge pull request #1097 from seppzer0/v5.6.4.2
ioctl_cfg80211: add an extra definition for cfg80211_connect_bss() calls
This commit is contained in:
commit
04f600ee54
2
Makefile
2
Makefile
@ -851,6 +851,8 @@ EXTRA_CFLAGS += -DRTW_ENABLE_WIFI_CONTROL_FUNC -DCONFIG_RADIO_WORK
|
||||
#EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE
|
||||
EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
|
||||
EXTRA_CFLAGS += -DCONFIG_P2P_IPS
|
||||
# A special rule for cfg80211_connect_bss() to receive all 10 arguments in an Android build
|
||||
EXTRA_CFLAGS += -DCONFIG_CFG80211_CONNECT_BSS_ANDROID
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_PLATFORM_ANDROID_X86), y)
|
||||
|
@ -1193,7 +1193,7 @@ 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)
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) || defined(CONFIG_CFG80211_CONNECT_BSS_ANDROID))
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user