Upgrade to 1.20.0

3 files changed, 11 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 99ca3eeaf976..81cb2b74595a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = asix-ax88179-dkms
 	pkgdesc = A kernel module for ASIX AX88178A AX88179 USB 3.0 network adapters
-	pkgver = 1.19.0
-	pkgrel = 3
+	pkgver = 1.20.0
+	pkgrel = 1
 	url = http://www.asix.com.tw/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = dkms
-	source = https://www.asix.com.tw/FrootAttach/driver/AX88179_178A_LINUX_DRIVER_v1.19.0_SOURCE.tar.bz2
+	source = https://www.asix.com.tw/FrootAttach/driver/AX88179_178A_LINUX_DRIVER_v1.20.0_SOURCE.tar.bz2
 	source = asix-ax88179-dkms.conf
 	source = 0001-No-date-time.patch
 	source = 0002-b2b128.patch
-	source = 0003-linux-4.20.patch
-	sha512sums = 4868203e7a2574fc1760c604dc0f6d8a6890e4d65912bfc1e47bcef2fd72f422e791441cd65e58737b10edb5e04a40cf1e10585ae8b9f385adc729fb34b7fb8a
+	sha512sums = 92b9178eddcc1c8765dc6d5dff33b2f385b23d7214d7f9c9ad13ef61ae62216a40b8d7e04b3a4bb3026b33f0452b7c00332bfb412ee008d426c57863add72edb
 	sha512sums = c22d3ec8bea598580681c6a9e2ae6b3d2118547a739ee717d4576653426ace7ec2406012d162ec6424244c360a2b9b7a185dbf3eebba6c0065efedfb54de23ba
 	sha512sums = 74a730f2ccfabf54c600391ee9a54ad3977b730c141c9ca9e7b1740c0d93161595a71312b4e3067411bde2f7d7f2a1cb9fb9e982a6ccfc0a4fbfa86829f6c346
 	sha512sums = a31cab0b3e0fa027acbf629aec7294d591d6dd01928de800bd915e78c75be7be0fe7603b6c69ed90f5a6fefe30ecf6a953fa154cccb03b9cb3e070e7566394f8
-	sha512sums = 8eb7b69b413f38599cbd8708e160f9ee3583334098cdf75a85225a6b26f45d35d10bc95cf0dccfa28616c466173f12c342bfd7ad7199f30bd666cf9c4717eb0a
 
 pkgname = asix-ax88179-dkms
 
diff --git a/0003-linux-4.20.patch b/0003-linux-4.20.patch
deleted file mode 100644
index 3a78095a46a7..000000000000
--- a/0003-linux-4.20.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-*** a/ax88179_178a.c	2018-01-02 09:37:42.000000000 +0100
---- b/ax88179_178a.c	2019-01-16 12:00:01.200486283 +0100
-***************
-*** 813,820 ****
---- 813,822 ----
-  	.set_wol		= ax88179_set_wol,
-  	.get_eeprom_len		= ax88179_get_eeprom_len,
-  	.get_eeprom		= ax88179_get_eeprom,
-+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
-  	.get_settings		= ax88179_get_settings,
-  	.set_settings		= ax88179_set_settings,
-+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0) */
-  #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
-  	.set_tx_csum		= ax88179_set_tx_csum,
-  	.get_tx_csum		= ax88179_get_tx_csum,
diff --git a/PKGBUILD b/PKGBUILD
index 4289e60e3bd9..a8083581ecf7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: Moritz Lipp <mlq at pwmt dot org>
 
 pkgname=asix-ax88179-dkms
-pkgver=1.19.0
-pkgrel=3
-pkgdesc="A kernel module for ASIX AX88178A AX88179 USB 3.0 network adapters"
+pkgver=1.20.0
+pkgrel=1
+pkgdesc='A kernel module for ASIX AX88178A AX88179 USB 3.0 network adapters'
 arch=('i686' 'x86_64')
 
 _filename="AX88179_178A_LINUX_DRIVER_v${pkgver}_SOURCE"
@@ -18,21 +18,20 @@ license=('GPL')
 
 depends=('dkms')
 
-_filename="AX88179_178A_LINUX_DRIVER_v${pkgver}_SOURCE"
+_filenameUrl="AX88179_178A_LINUX_DRIVER_v${pkgver}_SOURCE"
+_filename="AX88179_178A_Linux_Driver_v${pkgver}_source"
 _modname='ax88179_178a'
 source=(
-    "https://www.asix.com.tw/FrootAttach/driver/${_filename}.tar.bz2"
+    "https://www.asix.com.tw/FrootAttach/driver/${_filenameUrl}.tar.bz2"
     "${pkgname}.conf"
     '0001-No-date-time.patch'
     '0002-b2b128.patch'
-    '0003-linux-4.20.patch'
 )
 sha512sums=(
-    '4868203e7a2574fc1760c604dc0f6d8a6890e4d65912bfc1e47bcef2fd72f422e791441cd65e58737b10edb5e04a40cf1e10585ae8b9f385adc729fb34b7fb8a'
+    '92b9178eddcc1c8765dc6d5dff33b2f385b23d7214d7f9c9ad13ef61ae62216a40b8d7e04b3a4bb3026b33f0452b7c00332bfb412ee008d426c57863add72edb'
     'c22d3ec8bea598580681c6a9e2ae6b3d2118547a739ee717d4576653426ace7ec2406012d162ec6424244c360a2b9b7a185dbf3eebba6c0065efedfb54de23ba'
     '74a730f2ccfabf54c600391ee9a54ad3977b730c141c9ca9e7b1740c0d93161595a71312b4e3067411bde2f7d7f2a1cb9fb9e982a6ccfc0a4fbfa86829f6c346'
     'a31cab0b3e0fa027acbf629aec7294d591d6dd01928de800bd915e78c75be7be0fe7603b6c69ed90f5a6fefe30ecf6a953fa154cccb03b9cb3e070e7566394f8'
-    '74e5b9bfe73e6ff2a4a370ddf690462d3490e4d996ef1fe1f63bf5093ce70f63e309b60256e46d6085b694c2c5a6f8a811556497deba98292cd85708e5066589'
 )
 
 prepare() {
@@ -48,9 +47,6 @@ prepare() {
     # specific versions of the kernel.
     patch -p1 < "${srcdir}/0002-b2b128.patch"
 
-    # Linux kernel internals changed since Linux 4.20.
-    patch -p1 < "${srcdir}/0003-linux-4.20.patch"
-
     # Use a DKMS build against the right kernel release
     sed -i "${srcdir}/${_filename}/Makefile" \
         -e '/#KDIR/d' \