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

[Massimiliano Torromeo]

    Date: Tuesday, July 2, 2013 @ 14:34:25
  Author: mtorromeo
Revision: 93383

Implemented patch to build the module on kernel 3.10

Added:
  r8168/trunk/linux-3.10.patch
Modified:
  r8168/trunk/PKGBUILD

------------------+
 PKGBUILD         |   10 +++++++-
 linux-3.10.patch |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-02 10:38:04 UTC (rev 93382)
+++ PKGBUILD	2013-07-02 12:34:25 UTC (rev 93383)
@@ -12,9 +12,14 @@
 arch=('i686' 'x86_64')
 depends=('glibc' 'linux')
 makedepends=('linux-headers')
-source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
+source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2 linux-3.10.patch)
 install=$pkgname.install
 
+prepare() {
+	cd "$pkgname-$pkgver"
+	patch -p0 -i "$srcdir/linux-3.10.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)
@@ -42,4 +47,5 @@
 	sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
 }
 
-sha256sums=('937fd5d7d4cbfc95cf2859d8c3beb15a8536dc4e41752f7a53f2a25f07cdcd33')
+sha256sums=('937fd5d7d4cbfc95cf2859d8c3beb15a8536dc4e41752f7a53f2a25f07cdcd33'
+            '1fb115b4d1b6b058d23322b89fad52d29748ce75b2774815e72c679a235d0e87')

Added: linux-3.10.patch
===================================================================
--- linux-3.10.patch	                        (rev 0)
+++ linux-3.10.patch	2013-07-02 12:34:25 UTC (rev 93383)
@@ -0,0 +1,59 @@
+--- 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