mirrors/rtl8812au
1
0
Fork 0
mirror of https://github.com/aircrack-ng/rtl8812au.git synced 2024-11-25 06:34:10 +00:00
Code Releases Activity

Merge pull request #453 from CGarces/fix_4_9

Browse Source 
Fix compilation issue with kernel < 4.9
This commit is contained in:
Christian Bremvåg 2019-10-24 05:15:29 +02:00 committed by GitHub
commit 4d41ceafd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.travis.yml
View File

@ -1,9 +1,9 @@
language: c language: c
compiler: gcc compiler: gcc
sudo: required sudo: required
dist: xenial dist: bionic
before_install: install:
- export ALL_DEB=$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep -m1 all | cut -d '"' -f 2) - export ALL_DEB=$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep -m1 all | cut -d '"' -f 2)
- export KVER_BUILD=$(echo $ALL_DEB | cut -d '_' -f 1 | cut -c15-) - export KVER_BUILD=$(echo $ALL_DEB | cut -d '_' -f 1 | cut -c15-)
- wget ${KERNEL_URL}v${KVER}/$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep headers | grep generic | grep -m1 amd64 | cut -d '"' -f 2) - wget ${KERNEL_URL}v${KVER}/$(wget --quiet -O - ${KERNEL_URL}v${KVER}/ | grep -o 'href=".*"' | grep headers | grep generic | grep -m1 amd64 | cut -d '"' -f 2)
@ -22,65 +22,39 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- sourceline: 'ppa:ondrej/nginx-mainline' - ubuntu-toolchain-r-test
packages: packages:
- libssl1.1 - gcc-5
env: COMPILER=gcc-5 KVER=5.3 env: COMPILER=gcc-5 KVER=5.3.7
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-6 - gcc-6
- libssl1.1 env: COMPILER=gcc-6 KVER=5.3.7
env: COMPILER=gcc-6 KVER=5.3 - compiler: gcc
env: COMPILER=gcc-7 KVER=5.3.7
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-7 - gcc-5
- libssl1.1 env: COMPILER=gcc-5 KVER=4.19.67
env: COMPILER=gcc-7 KVER=5.3
- compiler: gcc
addons:
apt:
sources:
- sourceline: 'ppa:ondrej/nginx-mainline'
packages:
- libssl1.1
env: COMPILER=gcc-5 KVER=4.19.45
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-6 - gcc-6
- libssl1.1 env: COMPILER=gcc-6 KVER=4.19.67
env: COMPILER=gcc-6 KVER=4.19.45
- compiler: gcc - 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.19.67 env: COMPILER=gcc-7 KVER=4.19.67
- compiler: gcc - 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 env: COMPILER=gcc-7 KVER=4.15.18
- compiler: gcc
env: COMPILER=gcc-7 KVER=4.9.197

2
os_dep/linux/ioctl_cfg80211.c
View File

@ -4165,9 +4165,11 @@ static int rtw_cfg80211_add_monitor_if(_adapter *padapter, char *name, struct ne
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
mon_ndev->min_mtu = WLAN_MIN_ETHFRM_LEN; mon_ndev->min_mtu = WLAN_MIN_ETHFRM_LEN;
mon_ndev->mtu = WLAN_DATA_MAXLEN; mon_ndev->mtu = WLAN_DATA_MAXLEN;
mon_ndev->max_mtu = WLAN_DATA_MAXLEN; mon_ndev->max_mtu = WLAN_DATA_MAXLEN;
#endif
mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP; mon_ndev->type = ARPHRD_IEEE80211_RADIOTAP;
strncpy(mon_ndev->name, name, IFNAMSIZ); strncpy(mon_ndev->name, name, IFNAMSIZ);

3
os_dep/linux/os_intfs.c
View File

@ -1477,10 +1477,11 @@ struct net_device *rtw_init_netdev(_adapter *old_padapter)
if (!pnetdev) if (!pnetdev)
return NULL; return NULL;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN; pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN;
pnetdev->mtu = WLAN_DATA_MAXLEN; pnetdev->mtu = WLAN_DATA_MAXLEN;
pnetdev->max_mtu = WLAN_DATA_MAXLEN; pnetdev->max_mtu = WLAN_DATA_MAXLEN;
#endif
padapter = rtw_netdev_priv(pnetdev); padapter = rtw_netdev_priv(pnetdev);
padapter->pnetdev = pnetdev; padapter->pnetdev = pnetdev;

6
os_dep/osdep_service.c
View File

@ -2059,10 +2059,11 @@ struct net_device *rtw_alloc_etherdev_with_old_priv(int sizeof_priv, void *old_p
if (!pnetdev) if (!pnetdev)
goto RETURN; goto RETURN;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN; pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN;
pnetdev->mtu = WLAN_MAX_ETHFRM_LEN; pnetdev->mtu = WLAN_MAX_ETHFRM_LEN;
pnetdev->max_mtu = WLAN_DATA_MAXLEN; pnetdev->max_mtu = WLAN_DATA_MAXLEN;
#endif
pnpi = netdev_priv(pnetdev); pnpi = netdev_priv(pnetdev);
pnpi->priv = old_priv; pnpi->priv = old_priv;
pnpi->sizeof_priv = sizeof_priv; pnpi->sizeof_priv = sizeof_priv;
@ -2084,10 +2085,11 @@ struct net_device *rtw_alloc_etherdev(int sizeof_priv)
if (!pnetdev) if (!pnetdev)
goto RETURN; goto RETURN;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN; pnetdev->min_mtu = WLAN_MIN_ETHFRM_LEN;
pnetdev->mtu = WLAN_MAX_ETHFRM_LEN; pnetdev->mtu = WLAN_MAX_ETHFRM_LEN;
pnetdev->max_mtu = WLAN_DATA_MAXLEN; pnetdev->max_mtu = WLAN_DATA_MAXLEN;
#endif
pnpi = netdev_priv(pnetdev); pnpi = netdev_priv(pnetdev);
pnpi->priv = rtw_zvmalloc(sizeof_priv); pnpi->priv = rtw_zvmalloc(sizeof_priv);