[arch-commits] Commit in r8168/trunk (PKGBUILD linux-4.7.patch r8168.install)

[Massimiliano Torromeo]

    Date: Friday, August 12, 2016 @ 07:39:29
  Author: mtorromeo
Revision: 186502

upgpkg: r8168 8.042-3

Patched for linux 4.7

Added:
  r8168/trunk/linux-4.7.patch
Modified:
  r8168/trunk/PKGBUILD
  r8168/trunk/r8168.install

-----------------+
 PKGBUILD        |    9 ++++++---
 linux-4.7.patch |   34 ++++++++++++++++++++++++++++++++++
 r8168.install   |    2 +-
 3 files changed, 41 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-12 07:38:59 UTC (rev 186501)
+++ PKGBUILD	2016-08-12 07:39:29 UTC (rev 186502)
@@ -5,7 +5,7 @@
 
 pkgname=r8168
 pkgver=8.042
-pkgrel=2
+pkgrel=3
 pkgdesc="A kernel module for Realtek 8168 network cards"
 url="http://www.realtek.com.tw"
 license=("GPL")
@@ -14,13 +14,16 @@
 makedepends=('linux-headers')
 install=$pkgname.install
 source=(https://github.com/mtorromeo/r8168/archive/$pkgver/$pkgname-$pkgver.tar.gz
-        linux-4.5.patch)
+        linux-4.5.patch
+				linux-4.7.patch)
 sha256sums=('9dd8ae22115bcbef98c15b0b1e2160300cce3129ef7e0485d7e577188ba3fcc2'
-            'e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e')
+            'e05a4bccf28beecc97db246064a5fe80d1303476b76086bd262c9c8db82b2e6e'
+            'bbdc817278b17a1803c74228eaccbddb347ae92424a9a6cc92a68946f5392969')
 
 prepare() {
 	cd "$pkgname-$pkgver"
 	patch -p1 -i ../linux-4.5.patch
+	patch -p1 -i ../linux-4.7.patch
 }
 
 build() {

Added: linux-4.7.patch
===================================================================
--- linux-4.7.patch	                        (rev 0)
+++ linux-4.7.patch	2016-08-12 07:39:29 UTC (rev 186502)
@@ -0,0 +1,34 @@
+--- 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;
+ 

Modified: r8168.install
===================================================================
--- r8168.install	2016-08-12 07:38:59 UTC (rev 186501)
+++ r8168.install	2016-08-12 07:39:29 UTC (rev 186502)
@@ -1,5 +1,5 @@
 rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-4.6-ARCH'
+	EXTRAMODULES='extramodules-4.7-ARCH'
 	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }