Updated to 4.20.0

4 files changed, 8 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c63b6bc6d0f5..eca6a0563f07 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Dec 17 09:52:03 UTC 2016
+# Tue May  2 07:52:24 UTC 2017
 pkgbase = asix-module
 	pkgdesc = A kernel module for the ASIX USB 2.0 low power AX88772B/AX88772A/AX88760/AX88772/AX88178 ethernet controllers
-	pkgver = 4.19.0
+	pkgver = 4.20.0
 	pkgrel = 1
 	url = http://www.asix.com.tw
 	install = asix-module.install
@@ -12,10 +12,8 @@ pkgbase = asix-module
 	makedepends = linux-headers
 	depends = glibc
 	depends = linux
-	source = http://www.asix.com.tw/FrootAttach/driver/AX88772C_772B_772A_760_772_178_LINUX_DRIVER_v4.19.0_Source.tar.bz2
-	source = linux-4.7.patch
-	sha256sums = 14b5db0fec05fbc75d6bbe323f822973aa7d6f738bcc74ef3b211d04e21a0c50
-	sha256sums = c61fd6d00d78280df68be911f459662cd8b58b764b82d2ef4534b99dffa6e05e
+	source = http://www.asix.com.tw/FrootAttach/driver/AX88772C_772B_772A_760_772_178_LINUX_DRIVER_v4.20.0_Source.tar.gz
+	sha256sums = e1b360e2664e6cf0daf75088f344a8033cdcc94953b44e52b76a13de4e0527d6
 
 pkgname = asix-module
 	depends = linux>=
diff --git a/PKGBUILD b/PKGBUILD
index 7633c81170ca..c242949030a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=asix-module
-pkgver=4.19.0
+pkgver=4.20.0
 pkgrel=1
 pkgdesc="A kernel module for the ASIX USB 2.0 low power AX88772B/AX88772A/AX88760/AX88772/AX88178 ethernet controllers"
 url="http://www.asix.com.tw"
@@ -12,15 +12,8 @@ depends=('glibc' 'linux')
 makedepends=('linux-headers')
 install=$pkgname.install
 _filename=AX88772C_772B_772A_760_772_178_LINUX_DRIVER_v${pkgver}_Source
-source=(http://www.asix.com.tw/FrootAttach/driver/$_filename.tar.bz2
-        linux-4.7.patch)
-sha256sums=('14b5db0fec05fbc75d6bbe323f822973aa7d6f738bcc74ef3b211d04e21a0c50'
-            'c61fd6d00d78280df68be911f459662cd8b58b764b82d2ef4534b99dffa6e05e')
-
-prepare() {
-	cd "$srcdir"/$_filename
-	patch -p1 -i ../linux-4.7.patch
-}
+source=(http://www.asix.com.tw/FrootAttach/driver/$_filename.tar.gz)
+sha256sums=('e1b360e2664e6cf0daf75088f344a8033cdcc94953b44e52b76a13de4e0527d6')
 
 build() {
 	_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
diff --git a/asix-module.install b/asix-module.install
index 5db7e0bab4f5..8f8a0b9097c2 100644
--- a/asix-module.install
+++ b/asix-module.install
@@ -1,5 +1,5 @@
 rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-4.8-ARCH'
+	EXTRAMODULES='extramodules-4.10-ARCH'
 	depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/linux-4.7.patch b/linux-4.7.patch
deleted file mode 100644
index 7ca3c689353a..000000000000
--- a/linux-4.7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/axusbnet.c b/axusbnet.c
-index 26e7fcb..515ea34 100644
---- a/axusbnet.c
-+++ b/axusbnet.c
-@@ -1148,7 +1148,11 @@ axusbnet_start_xmit(struct sk_buff *skb, struct net_device *net)
- 			devdbg(dev, "tx: submit urb err %d", retval);
- 		break;
- 	case 0:
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
- 		net->trans_start = jiffies;
-+#else
-+		netif_trans_update(net);
-+#endif
- 		__skb_queue_tail(&dev->txq, skb);
- 		if (dev->txq.qlen >= TX_QLEN(dev))
- 			netif_stop_queue(net);
-@@ -1470,4 +1474,3 @@ axusbnet_resume(struct usb_interface *intf)
- 
- 	return retval;
- }
--