mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-26 15:14:02 +00:00
Code Releases Activity

Merge pull request #420 from CGarces/v5.6.4.1

Browse Source 
Fix compilation issue kernels < 4.18 (Ubuntu 18.04 and derived distros)
This commit is contained in:
Christian Bremvåg 2019-10-22 23:38:51 +02:00 committed by GitHub
commit bc9432f80d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -74,3 +74,13 @@ matrix:
- gcc-7 - gcc-7
- libssl1.1 - libssl1.1
env: COMPILER=gcc-7 KVER=4.19.67 env: COMPILER=gcc-7 KVER=4.19.67
- compiler: gcc
addons:
apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages:
- gcc-7
- libssl1.1
env: COMPILER=gcc-7 KVER=4.15.18

2
os_dep/linux/ioctl_cfg80211.c
View File

@ -4481,7 +4481,9 @@ void rtw_cfg80211_indicate_sta_assoc(_adapter *padapter, u8 *pmgmt_frame, uint f
sinfo.filled = STATION_INFO_ASSOC_REQ_IES; sinfo.filled = STATION_INFO_ASSOC_REQ_IES;
sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset; sinfo.assoc_req_ies = pmgmt_frame + WLAN_HDR_A3_LEN + ie_offset;
sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset; sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0))
cfg80211_sinfo_alloc_tid_stats(&sinfo, GFP_KERNEL); cfg80211_sinfo_alloc_tid_stats(&sinfo, GFP_KERNEL);
#endif
cfg80211_new_sta(ndev, get_addr2_ptr(pmgmt_frame), &sinfo, GFP_ATOMIC); cfg80211_new_sta(ndev, get_addr2_ptr(pmgmt_frame), &sinfo, GFP_ATOMIC);
} }
#else /* defined(RTW_USE_CFG80211_STA_EVENT) */ #else /* defined(RTW_USE_CFG80211_STA_EVENT) */