[arch-commits] Commit in r8168/trunk (PKGBUILD delayed_work_ethtool_ops_fix2.patch)

[Massimiliano Torromeo]

    Date: Monday, September 22, 2014 @ 09:49:38
  Author: mtorromeo
Revision: 119393

upgpkg: r8168 8.039.00-1

Updated to version 8.039.00

Modified:
  r8168/trunk/PKGBUILD
Deleted:
  r8168/trunk/delayed_work_ethtool_ops_fix2.patch

-------------------------------------+
 PKGBUILD                            |   18 ++++--------------
 delayed_work_ethtool_ops_fix2.patch |   26 --------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-22 07:34:42 UTC (rev 119392)
+++ PKGBUILD	2014-09-22 07:49:38 UTC (rev 119393)
@@ -4,8 +4,8 @@
 # Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
 
 pkgname=r8168
-pkgver=8.038.00
-pkgrel=11
+pkgver=8.039.00
+pkgrel=1
 pkgdesc="A kernel module for Realtek 8168 network cards"
 url="http://www.realtek.com.tw"
 license=("GPL")
@@ -13,19 +13,9 @@
 depends=('glibc' 'linux')
 makedepends=('linux-headers')
 install=$pkgname.install
-source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2"
-        delayed_work_ethtool_ops_fix2.patch)
-sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072'
-            '2a03fa65e476cb7dd3ed5976037e0218260ff2660b6a4c495a824865eb10c303')
+source=("ftp://WebUser:wK9xBuD5@95.130.192.218/cn/nic/r8168-$pkgver.tar.bz2")
+sha256sums=('767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd')
 
-prepare(){
-	cd "$pkgname-$pkgver"
-
-	# Fix build with Linux 3.15 and 3.16
-	# https://code.google.com/p/r8168/issues/detail?id=19
-	patch -Np1 -i "$srcdir/delayed_work_ethtool_ops_fix2.patch"
-}
-
 build() {
 	_kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
 	KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)

Deleted: delayed_work_ethtool_ops_fix2.patch
===================================================================
--- delayed_work_ethtool_ops_fix2.patch	2014-09-22 07:34:42 UTC (rev 119392)
+++ delayed_work_ethtool_ops_fix2.patch	2014-09-22 07:49:38 UTC (rev 119393)
@@ -1,26 +0,0 @@
---- 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