mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2024-11-08 20:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1097 from seppzer0/v5.6.4.2

Browse Source 
ioctl_cfg80211: add an extra definition for cfg80211_connect_bss() calls
This commit is contained in:
Christian Bremvåg 2023-07-23 13:16:17 +02:00 committed by GitHub
commit 04f600ee54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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)

2
os_dep/linux/ioctl_cfg80211.c
View File

@ -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