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

[Bartłomiej Piotrowski]

    Date: Tuesday, September 17, 2013 @ 10:31:49
  Author: bpiotrowski
Revision: 97309

upgpkg: r8168-lts 8.036.00-1

- rebuild against linux-lts 3.0.12

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

-------------------+
 PKGBUILD          |   21 ++++++++++++------
 linux-3.10.patch  |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 r8168-lts.install |    2 -
 3 files changed, 74 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-17 07:51:58 UTC (rev 97308)
+++ PKGBUILD	2013-09-17 08:31:49 UTC (rev 97309)
@@ -3,19 +3,25 @@
 
 pkgname=r8168-lts
 _pkgname=r8168
-pkgver=8.035.00
-pkgrel=4
+pkgver=8.036.00
+pkgrel=1
 pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
 url="http://www.realtek.com.tw"
 license=("GPL")
 arch=('i686' 'x86_64')
-depends=('glibc' "linux-lts>=3.0" "linux-lts<3.1")
-makedepends=("linux-lts-headers>=3.0" "linux-lts-headers<3.1")
-source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
+depends=('glibc' "linux-lts>=3.10" "linux-lts<3.11")
+makedepends=("linux-lts-headers>=3.10" "linux-lts-headers<3.11")
+source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2
+        linux-3.10.patch)
 install=$pkgname.install
 
-_extramodules=extramodules-3.0-lts
+_extramodules=extramodules-3.10-lts
 
+prepare() {
+	cd "$_pkgname-$pkgver"
+    patch -p0 -i ../linux-3.10.patch
+}
+
 build() {
 	cd "$_pkgname-$pkgver"
 	local _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
@@ -31,4 +37,5 @@
 	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
 }
 
-sha256sums=('b904d31fc9bd6c97cc34479a0eba0e3a9bba5351a43b56dd5fff6b7dc1a5df73')
+sha256sums=('937fd5d7d4cbfc95cf2859d8c3beb15a8536dc4e41752f7a53f2a25f07cdcd33'
+            '1fb115b4d1b6b058d23322b89fad52d29748ce75b2774815e72c679a235d0e87')

Added: linux-3.10.patch
===================================================================
--- linux-3.10.patch	                        (rev 0)
+++ linux-3.10.patch	2013-09-17 08:31:49 UTC (rev 97309)
@@ -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

Modified: r8168-lts.install
===================================================================
--- r8168-lts.install	2013-09-17 07:51:58 UTC (rev 97308)
+++ r8168-lts.install	2013-09-17 08:31:49 UTC (rev 97309)
@@ -1,5 +1,5 @@
 rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-3.0-lts'
+	EXTRAMODULES='extramodules-3.10-lts'
 	depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }