[arch-commits] Commit in r8168/trunk (3 files)

[Evangelos Foutras]

    Date: Monday, August 4, 2014 @ 12:35:51
  Author: foutrelis
Revision: 116839

upgpkg: r8168 8.038.00-10

Linux 3.16 rebuild.

Added:
  r8168/trunk/delayed_work_ethtool_ops_fix2.patch
Modified:
  r8168/trunk/PKGBUILD
  r8168/trunk/r8168.install

-------------------------------------+
 PKGBUILD                            |   17 +++++++----------
 delayed_work_ethtool_ops_fix2.patch |   26 ++++++++++++++++++++++++++
 r8168.install                       |    2 +-
 3 files changed, 34 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-04 09:54:08 UTC (rev 116838)
+++ PKGBUILD	2014-08-04 10:35:51 UTC (rev 116839)
@@ -5,7 +5,7 @@
 
 pkgname=r8168
 pkgver=8.038.00
-pkgrel=9
+pkgrel=10
 pkgdesc="A kernel module for Realtek 8168 network cards"
 url="http://www.realtek.com.tw"
 license=("GPL")
@@ -12,20 +12,18 @@
 arch=('i686' 'x86_64')
 depends=('glibc' 'linux')
 makedepends=('linux-headers')
-source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2")
 install=$pkgname.install
+source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2"
+        delayed_work_ethtool_ops_fix2.patch)
+sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072'
+            '2a03fa65e476cb7dd3ed5976037e0218260ff2660b6a4c495a824865eb10c303')
 
 prepare(){
 	cd "$pkgname-$pkgver"
 
-	# Fix build with Linux 3.15
+	# Fix build with Linux 3.15 and 3.16
 	# https://code.google.com/p/r8168/issues/detail?id=19
-	if grep -q PREPARE_DELAYED_WORK src/r8168_n.c; then
-		sed -i 's/PREPARE_DELAYED_WORK/INIT_DELAYED_WORK/' src/r8168_n.c
-	else
-		error 'PREPARE_DELAYED_WORK fix for Linux 3.15 is no longer needed.'
-		return 1
-	fi
+	patch -Np1 -i "$srcdir/delayed_work_ethtool_ops_fix2.patch"
 }
 
 build() {
@@ -55,4 +53,3 @@
 	sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
 }
 
-sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072')

Added: delayed_work_ethtool_ops_fix2.patch
===================================================================
--- delayed_work_ethtool_ops_fix2.patch	                        (rev 0)
+++ delayed_work_ethtool_ops_fix2.patch	2014-08-04 10:35:51 UTC (rev 116839)
@@ -0,0 +1,26 @@
+--- r8168-8.038.00/src/r8168_n.c.orig
++++ r8168-8.038.00/src/r8168_n.c
+@@ -17542,7 +17542,11 @@ rtl8168_init_one(struct pci_dev *pdev,
+ 
+     RTL_NET_DEVICE_OPS(rtl8168_netdev_ops);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0)
+     SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops);
++#else
++    dev->ethtool_ops = &rtl8168_ethtool_ops;
++#endif
+ 
+     dev->watchdog_timeo = RTL8168_TX_TIMEOUT;
+     dev->irq = pdev->irq;
+@@ -19119,7 +19123,11 @@ static void rtl8168_schedule_work(struct
+ {
+     struct rtl8168_private *tp = netdev_priv(dev);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0)
+     PREPARE_DELAYED_WORK(&tp->task, task);
++#else
++    INIT_DELAYED_WORK(&tp->task, task);
++#endif
+     schedule_delayed_work(&tp->task, 4);
+ }
+ #endif

Modified: r8168.install
===================================================================
--- r8168.install	2014-08-04 09:54:08 UTC (rev 116838)
+++ r8168.install	2014-08-04 10:35:51 UTC (rev 116839)
@@ -1,5 +1,5 @@
 rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-3.15-ARCH'
+	EXTRAMODULES='extramodules-3.16-ARCH'
 	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }