From f6fd8a7c1abf6ed771b0f47019fe9f73673f96ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Garc=C3=A9s?= Date: Sun, 22 Sep 2019 16:47:26 +0200 Subject: [PATCH 1/2] Travis CI: Create specific build for kernel 4.15.x (Ubuntu 18.04 and derived distros) --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5a34695..8168e39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,3 +74,13 @@ matrix: - gcc-7 - libssl1.1 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 From 19dcc3302edf4368064cab92007645348205ce75 Mon Sep 17 00:00:00 2001 From: Carlos Garces Date: Sat, 5 Oct 2019 16:34:17 +0200 Subject: [PATCH 2/2] Fix commpilation issue for kernels < 4.18 cfg80211_sinfo_alloc_tid_stats function was included at 8689c051a20195b228e19acb155c7d6e48a86753 --- os_dep/linux/ioctl_cfg80211.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index 017e5c3..8306b18 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -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.assoc_req_ies = pmgmt_frame + 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); +#endif cfg80211_new_sta(ndev, get_addr2_ptr(pmgmt_frame), &sinfo, GFP_ATOMIC); } #else /* defined(RTW_USE_CFG80211_STA_EVENT) */