Merge pull request #159 from CGarces/fix_5.4

Fix for kernel 5.4
This commit is contained in:
Carlos Garcés 2020-01-23 00:25:10 +01:00 committed by GitHub
commit 83b5aff2a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 42 deletions

View File

@ -1,7 +1,7 @@
language: c language: c
compiler: gcc compiler: gcc
sudo: required sudo: required
dist: xenial dist: bionic
before_install: before_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)
@ -22,55 +22,34 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- sourceline: 'ppa:ondrej/nginx-mainline' - sourceline: "ppa:ubuntu-toolchain-r/test"
packages: packages:
- libssl1.1 - gcc-9
env: COMPILER=gcc-5 KVER=5.3 env: COMPILER=gcc-9 KVER=5.4.13
- compiler: gcc
addons:
apt:
packages:
- gcc-8
env: COMPILER=gcc-8 KVER=5.4.13
#No longer builds on gcc-7.4 should be fixed by gcc-7.5
#- compiler: gcc
# env: COMPILER=gcc-7 KVER=5.4.13
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - sourceline: "ppa:ubuntu-toolchain-r/test"
- sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-6 - gcc-9
- libssl1.1 env: COMPILER=gcc-9 KVER=4.19.97
env: COMPILER=gcc-6 KVER=5.3
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-7 - gcc-8
- libssl1.1 env: COMPILER=gcc-8 KVER=4.19.97
env: COMPILER=gcc-7 KVER=5.3
- compiler: gcc - compiler: gcc
addons: env: COMPILER=gcc-7 KVER=4.19.97
apt:
sources:
- sourceline: 'ppa:ondrej/nginx-mainline'
packages:
- libssl1.1
env: COMPILER=gcc-5 KVER=4.19.74
- compiler: gcc - compiler: gcc
addons: env: COMPILER=gcc-7 KVER=4.15.18
apt:
sources:
- ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline'
packages:
- gcc-6
- libssl1.1
env: COMPILER=gcc-6 KVER=4.19.74
- 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.74

View File

@ -258,6 +258,7 @@ void rtw_txpwr_init_regd(struct rf_ctl_t *rfctl)
); );
if (rfctl->regd_name) if (rfctl->regd_name)
break; break;
__attribute__ ((__fallthrough__));
default: default:
rfctl->regd_name = regd_str(TXPWR_LMT_WW); rfctl->regd_name = regd_str(TXPWR_LMT_WW);
RTW_PRINT("assign %s for default case\n", regd_str(TXPWR_LMT_WW)); RTW_PRINT("assign %s for default case\n", regd_str(TXPWR_LMT_WW));
@ -1342,7 +1343,11 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
ptable->func = &OnAuth; ptable->func = &OnAuth;
else else
ptable->func = &OnAuthClient; ptable->func = &OnAuthClient;
/* pass through */ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
__attribute__ ((fallthrough));
#else
__attribute__ ((__fallthrough__));
#endif
case WIFI_ASSOCREQ: case WIFI_ASSOCREQ:
case WIFI_REASSOCREQ: case WIFI_REASSOCREQ:
_mgt_dispatcher(padapter, ptable, precv_frame); _mgt_dispatcher(padapter, ptable, precv_frame);