summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Gathoye2020-06-09 09:31:32 +0200
committerWilliam Gathoye2020-06-09 09:53:33 +0200
commit8c31530d34b1ad489c00fa676164f4d30786a12c (patch)
treee4e1f9ca68541682e1feab4d871073f4c7a313c9
parent2f5bdbcb2a305d13443128cb010c23e2b9e3270f (diff)
downloadaur-8c31530d34b1ad489c00fa676164f4d30786a12c.tar.gz
Upgrade to 4.24 and patch for kernels > 5.5
-rw-r--r--.SRCINFO12
-rw-r--r--0001-linux-5.5.patch14
-rw-r--r--PKGBUILD14
3 files changed, 27 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 89272756c79..99574eb7c70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = asix-dkms
pkgdesc = A kernel module for ASIX AX88760 AX88772 AX88772A AX88772B AX88772C AX88178 USB 2.0 network adapters
- pkgver = 4.23.0
- pkgrel = 4
+ pkgver = 4.24.0
+ pkgrel = 1
url = http://www.asix.com.tw/
arch = i686
arch = x86_64
@@ -10,12 +10,12 @@ pkgbase = asix-dkms
provides = asix-dkms
provides = asix-module
conflicts = asix-module
- source = https://www.asix.com.tw/FrootAttach/driver/AX88772C_772B_772A_760_772_178_Linux_Driver_v4.23.0_Source.tar.bz2
+ source = https://www.asix.com.tw/FrootAttach/driver/AX88772C_772B_772A_760_772_178_Linux_Driver_v4.24.0_Source.tar.bz2
source = dkms.conf
- source = linux-4.20.patch
- sha512sums = 7c43eed69e948f2d921b758c2dab1236540832c7ce48b7308b6e3fa5ee1e4f4bc9f190e1497ea85d7a953959bd86f00461ae81c0bbd710959c7dafba6c4c2688
+ source = 0001-linux-5.5.patch
+ sha512sums = 039622836e321350476e37120e837885bea070f17782232150c157ee667335952f694b052ebdeb4e7df35d4c342a788dd661066f5b5d7606a2600bdebeb68958
sha512sums = ba2f214bc0baa2b2f8baf480e904ea8ed15dfc24c15d3dd453f9a0db47615b16ff5722fc1384435959b281b4ec322956ba1380fef8146ef019ddc56e304c495d
- sha512sums = e9e7025e8157d6950200a45a07d35de99c1342a60f02fa1701753e589cfa1964de86c136e8ce26f51d284cd716f75fe9953b1ee09381e9f1599aa89c8e61db8f
+ sha512sums = c2d1c1718b89624a244e0dc697557f9b0f9de08fbb8a85356f836e55b8e6aa2a88630aaa14d28a76cac16ee949153fec2caf427e3b1ecac9fb44cf8519ce2215
pkgname = asix-dkms
diff --git a/0001-linux-5.5.patch b/0001-linux-5.5.patch
new file mode 100644
index 00000000000..2919ca748d3
--- /dev/null
+++ b/0001-linux-5.5.patch
@@ -0,0 +1,14 @@
+--- a/axusbnet.c 2020-06-09 09:40:11.491845696 +0200
++++ b/axusbnet.c 2020-06-09 09:41:34.533243738 +0200
+@@ -1062,7 +1062,11 @@
+ /*-------------------------------------------------------------------------*/
+
+ static
++#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 5, 0)
++void axusbnet_tx_timeout(struct net_device *net, unsigned int i)
++#else
+ void axusbnet_tx_timeout(struct net_device *net)
++#endif
+ {
+ struct usbnet *dev = netdev_priv(net);
+ struct driver_info *info = dev->driver_info;
diff --git a/PKGBUILD b/PKGBUILD
index 450bdb088dd..2746459f0e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
pkgname=asix-dkms
_pkgbase=asix
-pkgver=4.23.0
-pkgrel=4
+pkgver=4.24.0
+pkgrel=1
pkgdesc='A kernel module for ASIX AX88760 AX88772 AX88772A AX88772B AX88772C AX88178 USB 2.0 network adapters'
arch=('i686' 'x86_64')
@@ -23,19 +23,19 @@ _filename="AX88772C_772B_772A_760_772_178_Linux_Driver_v${pkgver}_Source"
source=(
"https://www.asix.com.tw/FrootAttach/driver/${_filename}.tar.bz2"
'dkms.conf'
- 'linux-4.20.patch'
+ '0001-linux-5.5.patch'
)
sha512sums=(
- '7c43eed69e948f2d921b758c2dab1236540832c7ce48b7308b6e3fa5ee1e4f4bc9f190e1497ea85d7a953959bd86f00461ae81c0bbd710959c7dafba6c4c2688'
+ '039622836e321350476e37120e837885bea070f17782232150c157ee667335952f694b052ebdeb4e7df35d4c342a788dd661066f5b5d7606a2600bdebeb68958'
'ba2f214bc0baa2b2f8baf480e904ea8ed15dfc24c15d3dd453f9a0db47615b16ff5722fc1384435959b281b4ec322956ba1380fef8146ef019ddc56e304c495d'
- 'e9e7025e8157d6950200a45a07d35de99c1342a60f02fa1701753e589cfa1964de86c136e8ce26f51d284cd716f75fe9953b1ee09381e9f1599aa89c8e61db8f'
+ 'c2d1c1718b89624a244e0dc697557f9b0f9de08fbb8a85356f836e55b8e6aa2a88630aaa14d28a76cac16ee949153fec2caf427e3b1ecac9fb44cf8519ce2215'
)
prepare() {
cd "${srcdir}/${_filename}"
- # Linux kernel internals changed since Linux 4.20.
- patch -p1 < "${srcdir}/linux-4.20.patch"
+ # Linux kernel internals changed since Linux 5.5.
+ patch -p1 < "${srcdir}/0001-linux-5.5.patch"
# Use a DKMS build against the right kernel release
sed -i "${srcdir}/${_filename}/Makefile" \