[arch-commits] Commit in r8168-lts/trunk (PKGBUILD linux-3.10.patch)
Massimiliano Torromeo
mtorromeo at archlinux.org
Mon Sep 22 07:59:37 UTC 2014
Date: Monday, September 22, 2014 @ 09:59:37
Author: mtorromeo
Revision: 119396
upgpkg: r8168-lts 8.039.00-1
Updated to version 8.039.00
Modified:
r8168-lts/trunk/PKGBUILD
Deleted:
r8168-lts/trunk/linux-3.10.patch
------------------+
PKGBUILD | 9 +++-----
linux-3.10.patch | 59 -----------------------------------------------------
2 files changed, 4 insertions(+), 64 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-22 07:56:21 UTC (rev 119395)
+++ PKGBUILD 2014-09-22 07:59:37 UTC (rev 119396)
@@ -3,8 +3,8 @@
pkgname=r8168-lts
_pkgname=r8168
-pkgver=8.038.00
-pkgrel=6
+pkgver=8.039.00
+pkgrel=1
pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
url="http://www.realtek.com.tw"
license=("GPL")
@@ -11,8 +11,9 @@
arch=('i686' 'x86_64')
depends=('glibc' "linux-lts>=3.14.11" "linux-lts<3.15")
makedepends=("linux-lts-headers>=3.14" "linux-lts-headers<3.15")
-source=("https://dl.dropboxusercontent.com/u/362439/archlinux/r8168-$pkgver.tar.bz2")
install=$pkgname.install
+source=("ftp://WebUser:wK9xBuD5@95.130.192.218/cn/nic/r8168-$pkgver.tar.bz2")
+sha256sums=('767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd')
_extramodules=extramodules-3.14-lts
@@ -30,5 +31,3 @@
install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko"
find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
}
-
-sha256sums=('1384bdf4d33b219f937bf1a600c72b22962baf7796e562b08e4da3c000f49072')
Deleted: linux-3.10.patch
===================================================================
--- linux-3.10.patch 2014-09-22 07:56:21 UTC (rev 119395)
+++ linux-3.10.patch 2014-09-22 07:59:37 UTC (rev 119396)
@@ -1,59 +0,0 @@
---- src/r8168_n.c.orig 2013-07-02 14:20:27.355887286 +0200
-+++ src/r8168_n.c 2013-07-02 14:24:25.302573010 +0200
-@@ -52,6 +52,10 @@
- #include <linux/init.h>
- #include <linux/rtnetlink.h>
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+#include <linux/if_ether.h>
-+#endif
-+
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
- #include <linux/pci-aspm.h>
- #endif
-@@ -2232,6 +2236,9 @@
- swab16(opts2 & 0xffff));
- ret = 0;
- }
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+ if (opts2 & RxVlanTag)
-+ __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff));
- #else
- if (opts2 & RxVlanTag)
- __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
-@@ -2295,7 +2302,11 @@
- else
- tp->cp_cmd &= ~RxChkSum;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+ if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
-+#else
- if (dev->features & NETIF_F_HW_VLAN_RX)
-+#endif
- tp->cp_cmd |= RxVlan;
- else
- tp->cp_cmd &= ~RxVlan;
-@@ -16195,7 +16206,11 @@
-
- #ifdef CONFIG_R8168_VLAN
- if (tp->mcfg != CFG_METHOD_DEFAULT) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+ dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
-+#else
- dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-+#endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- dev->vlan_rx_kill_vid = rtl8168_vlan_rx_kill_vid;
- #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
-@@ -16210,7 +16225,11 @@
- #else
- dev->features |= NETIF_F_RXCSUM;
- dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
-+ NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
-+#else
- NETIF_F_RXCSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
-+#endif
- dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
- NETIF_F_HIGHDMA;
- #endif
More information about the arch-commits
mailing list