From 1722ad907f7363eac77901e8463d2a4690797419 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 28 Aug 2018 02:40:15 +0100 Subject: [PATCH 1/3] IEEE80211_MAX_AMPDU_BUF is bumped in 4.19-rc1 - avoid redefine warning Ref: https://github.com/torvalds/linux/commit/b8042b3da925f390c1482bf9dc0898dc0b3ea7b5 --- include/wifi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/wifi.h b/include/wifi.h index 29f4961..ba0b48f 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -1016,7 +1016,9 @@ typedef enum _HT_CAP_AMPDU_DENSITY { * According to IEEE802.11n spec size varies from 8K to 64K (in powers of 2) */ #define IEEE80211_MIN_AMPDU_BUF 0x8 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0)) #define IEEE80211_MAX_AMPDU_BUF 0x40 +#endif /* Spatial Multiplexing Power Save Modes */ From 627d1adcd6cbba0303f865ff55148f45adc94775 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 28 Aug 2018 02:42:16 +0100 Subject: [PATCH 2/3] rtw_select_queue signature change in 4.19-rc1 Ref: https://github.com/torvalds/linux/commit/4f49dec9075aa0277b8c9c657ec31e6361f88724 --- os_dep/linux/os_intfs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index 8bf1741..da5bb60 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -929,13 +929,14 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) + , struct net_device *sb_dev +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) , void *accel_priv +#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) , select_queue_fallback_t fallback #endif - -#endif ) { _adapter *padapter = rtw_netdev_priv(dev); From 858ac32a7d00078d28246052de524cd79c873ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Garc=C3=A9s?= Date: Wed, 29 Aug 2018 23:23:49 +0200 Subject: [PATCH 3/3] Update to 4.19-rc1 --- .travis.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0089e94..2377632 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,11 @@ before_install: - 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}/$ALL_DEB + - sudo apt-get update + - sudo apt-get install -y dpkg # to upgrade to dpkg >= 1.17.5ubuntu5.8, which fixes https://bugs.launchpad.net/ubuntu/+source/dpkg/+bug/1730627 - sudo dpkg -i *.deb script: - - gcc --version - make CC=$COMPILER KVER=$KVER_BUILD-generic env: @@ -24,28 +25,34 @@ matrix: apt: sources: - ubuntu-toolchain-r-test + - sourceline: 'ppa:ondrej/nginx-mainline' packages: - gcc-5 - libelf-dev - env: COMPILER=gcc-5 KVER=4.15-rc6 + - libssl1.1 + env: COMPILER=gcc-5 KVER=4.19-rc1 - compiler: gcc addons: apt: sources: - ubuntu-toolchain-r-test + - sourceline: 'ppa:ondrej/nginx-mainline' packages: - gcc-6 - libelf-dev - env: COMPILER=gcc-6 KVER=4.15-rc6 + - libssl1.1 + env: COMPILER=gcc-6 KVER=4.19-rc1 - compiler: gcc addons: apt: sources: - ubuntu-toolchain-r-test + - sourceline: 'ppa:ondrej/nginx-mainline' packages: - gcc-7 - libelf-dev - env: COMPILER=gcc-7 KVER=4.15-rc6 + - libssl1.1 + env: COMPILER=gcc-7 KVER=4.19-rc1 - compiler: gcc addons: apt: