Github/rtl8192eu-linux-driver
1
0
Fork 0
mirror of https://github.com/Mange/rtl8192eu-linux-driver synced 2024-11-25 06:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #125 from MilhouseVH/fix-5.2-rc1

Browse Source 
fix 5.2-rc1: remove 'fallback' argument
This commit is contained in:
Carlos Garcés 2019-05-30 11:31:19 +02:00 committed by GitHub
commit de76ef8e49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
.travis.yml
View File

@ -1,19 +1,17 @@
language: c language: c
compiler: gcc compiler: gcc
sudo: required sudo: required
dist: xenial
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)
- 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)
- wget ${KERNEL_URL}v${KVER}/$ALL_DEB - 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 - sudo dpkg -i *.deb
script: script:
- make CC=$COMPILER KVER=$KVER_BUILD-generic - make CC=$COMPILER KVER=$KVER_BUILD-generic
env: env:
global: global:
- KERNEL_URL=http://kernel.ubuntu.com/~kernel-ppa/mainline/ - KERNEL_URL=http://kernel.ubuntu.com/~kernel-ppa/mainline/
@ -24,13 +22,10 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test
- sourceline: 'ppa:ondrej/nginx-mainline' - sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-5
- libelf-dev
- libssl1.1 - libssl1.1
env: COMPILER=gcc-5 KVER=5.0-rc1 env: COMPILER=gcc-5 KVER=5.2-rc2
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -39,9 +34,8 @@ matrix:
- sourceline: 'ppa:ondrej/nginx-mainline' - sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-6 - gcc-6
- libelf-dev
- libssl1.1 - libssl1.1
env: COMPILER=gcc-6 KVER=5.0-rc1 env: COMPILER=gcc-6 KVER=5.2-rc2
- compiler: gcc - compiler: gcc
addons: addons:
apt: apt:
@ -50,30 +44,33 @@ matrix:
- sourceline: 'ppa:ondrej/nginx-mainline' - sourceline: 'ppa:ondrej/nginx-mainline'
packages: packages:
- gcc-7 - gcc-7
- libelf-dev
- libssl1.1 - libssl1.1
env: COMPILER=gcc-7 KVER=5.0-rc1 env: COMPILER=gcc-7 KVER=5.2-rc2
- 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-5 - gcc-6
env: COMPILER=gcc-5 KVER=4.4.97 - libssl1.1
env: COMPILER=gcc-6 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-4.9 - gcc-7
env: COMPILER=gcc-4.9 KVER=3.16.50 - libssl1.1
- compiler: gcc env: COMPILER=gcc-7 KVER=4.19.45
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-5
env: COMPILER=gcc-5 KVER=3.14.79

2
os_dep/linux/os_intfs.c
View File

@ -934,7 +934,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
, void *accel_priv , void *accel_priv
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
, select_queue_fallback_t fallback , select_queue_fallback_t fallback
#endif #endif
) )