Updated to 4.18.0 with patch to build against linux 4.7

4 files changed, 39 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba8d37b9774c..2fe477c9c956 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri Aug 12 13:51:57 UTC 2016
 pkgbase = asix-module
 	pkgdesc = A kernel module for the ASIX USB 2.0 low power AX88772B/AX88772A/AX88760/AX88772/AX88178 ethernet controllers
-	pkgver = 4.17.3
+	pkgver = 4.18.0
 	pkgrel = 1
 	url = http://www.asix.com.tw
 	install = asix-module.install
@@ -10,8 +12,10 @@ 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.17.3_Source.tar.gz
-	sha256sums = 2c3d4481e830222f35738bcd89a6b7c590625150af51bc937d14b1eadefcf49e
+	source = http://www.asix.com.tw/FrootAttach/driver/AX88772C_772B_772A_760_772_178_LINUX_DRIVER_v4.18.0_Source.tar.bz2
+	source = linux-4.7.patch
+	sha256sums = 3aab9309e031ff66240701bcb4d68adfcdb91d84db8888defb783825cabfaf18
+	sha256sums = c61fd6d00d78280df68be911f459662cd8b58b764b82d2ef4534b99dffa6e05e
 
 pkgname = asix-module
 	depends = linux>=
diff --git a/PKGBUILD b/PKGBUILD
index 6c7f3fe157e1..d3213c21860c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=asix-module
-pkgver=4.17.3
+pkgver=4.18.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"
@@ -11,9 +11,15 @@ arch=('i686' 'x86_64')
 depends=('glibc' 'linux')
 makedepends=('linux-headers')
 _filename=AX88772C_772B_772A_760_772_178_LINUX_DRIVER_v${pkgver}_Source
-source=(http://www.asix.com.tw/FrootAttach/driver/$_filename.tar.gz)
+source=(http://www.asix.com.tw/FrootAttach/driver/$_filename.tar.bz2
+        linux-4.7.patch)
 install=$pkgname.install
 
+prepare() {
+	cd "$srcdir"/$_filename
+	patch -p1 -i ../linux-4.7.patch
+}
+
 build() {
 	_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
 	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
@@ -34,4 +40,5 @@ package() {
 	sed -i "s|extramodules-.*-ARCH|extramodules-$_kernver-ARCH|" "$startdir/$pkgname.install"
 }
 
-sha256sums=('2c3d4481e830222f35738bcd89a6b7c590625150af51bc937d14b1eadefcf49e')
+sha256sums=('3aab9309e031ff66240701bcb4d68adfcdb91d84db8888defb783825cabfaf18'
+            'c61fd6d00d78280df68be911f459662cd8b58b764b82d2ef4534b99dffa6e05e')
diff --git a/asix-module.install b/asix-module.install
index 86dd28c240d8..82ec1fd1284f 100644
--- a/asix-module.install
+++ b/asix-module.install
@@ -1,5 +1,5 @@
 rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-4.2-ARCH'
+	EXTRAMODULES='extramodules-4.7-ARCH'
 	depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/linux-4.7.patch b/linux-4.7.patch
new file mode 100644
index 000000000000..7ca3c689353a
--- /dev/null
+++ b/linux-4.7.patch
@@ -0,0 +1,21 @@
+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;
+ }
+-