updated for kernel 4.9

4 files changed, 18 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f65b6418e30..ee040e4a3d01 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Sep 28 00:29:43 UTC 2016
-pkgbase = r8168-aufs
-	pkgdesc = A kernel module for Realtek 8168 network cards
-	pkgver = 8.042
+# Wed Feb  8 00:21:05 UTC 2017
+pkgbase = r8168-aufs_friendly
+	pkgdesc = A kernel module for Realtek 8168 network cards(AUFS Friendly Kernel)
+	pkgver = 8.043.02
 	pkgrel = 4
 	url = http://www.realtek.com.tw
 	install = r8168.install
@@ -12,14 +12,12 @@ pkgbase = r8168-aufs
 	makedepends = linux-aufs_friendly-headers
 	depends = glibc
 	depends = linux-aufs_friendly
-	source = https://github.com/mtorromeo/r8168/archive/8.042/r8168-8.042.tar.gz
+	source = https://github.com/mtorromeo/r8168/archive/8.043.02/r8168-8.043.02.tar.gz
 	source = linux-4.5.patch
-	source = linux-4.7.patch
-	sha256sums = 9dd8ae22115bcbef98c15b0b1e2160300cce3129ef7e0485d7e577188ba3fcc2
+	sha256sums = ea22aa1dfda20615f5e114f982f7e61385f871f682eea0c154245760a439abc4
 	sha256sums = e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e
-	sha256sums = bbdc817278b17a1803c74228eaccbddb347ae92424a9a6cc92a68946f5392969
 
-pkgname = r8168-aufs
-	depends = linux>=
-	depends = linux<.1
+pkgname = r8168-aufs_friendly
+	depends = linux-aufs_friendly>=
+	depends = linux-aufs_friendly<.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 849c69b6fb58..6315e3a2d5fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 187549 2016-08-25 20:13:53Z tpowa $
+# $Id: PKGBUILD 209200 2017-01-27 07:00:17Z tpowa $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Bob Fanger < bfanger(at)gmail >
 # Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
 
-pkgname=r8168-aufs
 _pkgname=r8168
-pkgver=8.042
+pkgname=r8168-aufs_friendly
+pkgver=8.043.02
 pkgrel=4
-pkgdesc="A kernel module for Realtek 8168 network cards"
+pkgdesc="A kernel module for Realtek 8168 network cards(AUFS Friendly Kernel)"
 url="http://www.realtek.com.tw"
 license=("GPL")
 arch=('i686' 'x86_64')
@@ -15,20 +15,17 @@ depends=('glibc' 'linux-aufs_friendly')
 makedepends=('linux-aufs_friendly-headers')
 install=$_pkgname.install
 source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$_pkgname-$pkgver.tar.gz
-        linux-4.5.patch
-	linux-4.7.patch)
-sha256sums=('9dd8ae22115bcbef98c15b0b1e2160300cce3129ef7e0485d7e577188ba3fcc2'
-            'e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e'
-            'bbdc817278b17a1803c74228eaccbddb347ae92424a9a6cc92a68946f5392969')
+        linux-4.5.patch)
+sha256sums=('ea22aa1dfda20615f5e114f982f7e61385f871f682eea0c154245760a439abc4'
+            'e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e')
 
 prepare() {
 	cd "$_pkgname-$pkgver"
 	patch -p1 -i ../linux-4.5.patch
-	patch -p1 -i ../linux-4.7.patch
 }
 
 build() {
-	_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+	_kernver=$(pacman -Q linux-aufs_friendly | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
 	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-aufs_friendly/version)
 
 	cd "$_pkgname-$pkgver"
diff --git a/linux-4.7.patch b/linux-4.7.patch
deleted file mode 100644
index 6ef62d02d2ed..000000000000
--- a/linux-4.7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- r8168-8.042.00/src/r8168_n.c.orig	2016-08-01 21:20:42.000000000 +0200
-+++ r8168-8.042.00/src/r8168_n.c	2016-08-01 21:32:49.488072441 +0200
-@@ -22800,7 +22800,9 @@
-                         dev->hw_features &= ~NETIF_F_IPV6_CSUM;
-                         netif_set_gso_max_size(dev, LSO_32K);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
-                         dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
-+#endif
-                         dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO_64K;
- #endif
-                 } else {
-@@ -22808,7 +22810,9 @@
-                         dev->features |=  NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
-                         netif_set_gso_max_size(dev, LSO_64K);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
-                         dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
-+#endif
-                         dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
- #endif
-                 }
-@@ -24970,7 +24974,11 @@
-         wmb();
-         txd->opts1 = cpu_to_le32(opts1);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
-         dev->trans_start = jiffies;
-+#else
-+        netif_trans_update(dev);
-+#endif
- 
-         tp->cur_tx += frags + 1;
- 
diff --git a/r8168.install b/r8168.install
index 12b9919b0a47..6c0770ed3eb3 100644
--- a/r8168.install
+++ b/r8168.install
@@ -1,5 +1,5 @@
 rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-4.7-aufs_friendly'
+	EXTRAMODULES='extramodules-4.9-aufs_friendly'
 	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }