[arch-commits] Commit in r8168/repos (12 files)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Mon Jul 22 13:43:22 UTC 2013
Date: Monday, July 22, 2013 @ 15:43:22
Author: tpowa
Revision: 94375
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
r8168/repos/community-testing-i686/PKGBUILD
(from rev 94374, r8168/trunk/PKGBUILD)
r8168/repos/community-testing-i686/linux-3.10.patch
(from rev 94374, r8168/trunk/linux-3.10.patch)
r8168/repos/community-testing-i686/r8168.install
(from rev 94374, r8168/trunk/r8168.install)
r8168/repos/community-testing-x86_64/PKGBUILD
(from rev 94374, r8168/trunk/PKGBUILD)
r8168/repos/community-testing-x86_64/linux-3.10.patch
(from rev 94374, r8168/trunk/linux-3.10.patch)
r8168/repos/community-testing-x86_64/r8168.install
(from rev 94374, r8168/trunk/r8168.install)
Deleted:
r8168/repos/community-testing-i686/PKGBUILD
r8168/repos/community-testing-i686/linux-3.10.patch
r8168/repos/community-testing-i686/r8168.install
r8168/repos/community-testing-x86_64/PKGBUILD
r8168/repos/community-testing-x86_64/linux-3.10.patch
r8168/repos/community-testing-x86_64/r8168.install
-------------------------------------------+
/PKGBUILD | 102 ++++++++++++++++++++++++
/linux-3.10.patch | 118 ++++++++++++++++++++++++++++
/r8168.install | 34 ++++++++
community-testing-i686/PKGBUILD | 51 ------------
community-testing-i686/linux-3.10.patch | 59 --------------
community-testing-i686/r8168.install | 17 ----
community-testing-x86_64/PKGBUILD | 51 ------------
community-testing-x86_64/linux-3.10.patch | 59 --------------
community-testing-x86_64/r8168.install | 17 ----
9 files changed, 254 insertions(+), 254 deletions(-)
Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD 2013-07-22 13:43:08 UTC (rev 94374)
+++ community-testing-i686/PKGBUILD 2013-07-22 13:43:22 UTC (rev 94375)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Bob Fanger < bfanger(at)gmail >
-# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
-
-pkgname=r8168
-pkgver=8.036.00
-pkgrel=3
-pkgdesc="A kernel module for Realtek 8168 network cards"
-url="http://www.realtek.com.tw"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('glibc' 'linux')
-makedepends=('linux-headers')
-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)
-
- cd "$pkgname-$pkgver"
-
- # avoid using the Makefile directly -- it doesn't understand
- # any kernel but the current.
- make -C /usr/lib/modules/$KERNEL_RELEASE/build \
- SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
- EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
- modules
-}
-
-package() {
- _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
- depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
- KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
- msg "Kernel = $KERNEL_VERSION"
-
- cd "$pkgname-$pkgver"
- install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-
- sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
-}
-
-sha256sums=('937fd5d7d4cbfc95cf2859d8c3beb15a8536dc4e41752f7a53f2a25f07cdcd33'
- '1fb115b4d1b6b058d23322b89fad52d29748ce75b2774815e72c679a235d0e87')
Copied: r8168/repos/community-testing-i686/PKGBUILD (from rev 94374, r8168/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2013-07-22 13:43:22 UTC (rev 94375)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Bob Fanger < bfanger(at)gmail >
+# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
+
+pkgname=r8168
+pkgver=8.036.00
+pkgrel=3
+pkgdesc="A kernel module for Realtek 8168 network cards"
+url="http://www.realtek.com.tw"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('glibc' 'linux')
+makedepends=('linux-headers')
+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)
+
+ cd "$pkgname-$pkgver"
+
+ # avoid using the Makefile directly -- it doesn't understand
+ # any kernel but the current.
+ make -C /usr/lib/modules/$KERNEL_RELEASE/build \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+package() {
+ _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
+ depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
+ msg "Kernel = $KERNEL_VERSION"
+
+ cd "$pkgname-$pkgver"
+ install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
+}
+
+sha256sums=('937fd5d7d4cbfc95cf2859d8c3beb15a8536dc4e41752f7a53f2a25f07cdcd33'
+ '1fb115b4d1b6b058d23322b89fad52d29748ce75b2774815e72c679a235d0e87')
Deleted: community-testing-i686/linux-3.10.patch
===================================================================
--- community-testing-i686/linux-3.10.patch 2013-07-22 13:43:08 UTC (rev 94374)
+++ community-testing-i686/linux-3.10.patch 2013-07-22 13:43:22 UTC (rev 94375)
@@ -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
Copied: r8168/repos/community-testing-i686/linux-3.10.patch (from rev 94374, r8168/trunk/linux-3.10.patch)
===================================================================
--- community-testing-i686/linux-3.10.patch (rev 0)
+++ community-testing-i686/linux-3.10.patch 2013-07-22 13:43:22 UTC (rev 94375)
@@ -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
Deleted: community-testing-i686/r8168.install
===================================================================
--- community-testing-i686/r8168.install 2013-07-22 13:43:08 UTC (rev 94374)
+++ community-testing-i686/r8168.install 2013-07-22 13:43:22 UTC (rev 94375)
@@ -1,17 +0,0 @@
-rebuild_module_dependencies() {
- EXTRAMODULES='extramodules-3.10-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
- rebuild_module_dependencies
- echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
- echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
-}
-post_upgrade() {
- rebuild_module_dependencies
-}
-
-post_remove() {
- rebuild_module_dependencies
-}
Copied: r8168/repos/community-testing-i686/r8168.install (from rev 94374, r8168/trunk/r8168.install)
===================================================================
--- community-testing-i686/r8168.install (rev 0)
+++ community-testing-i686/r8168.install 2013-07-22 13:43:22 UTC (rev 94375)
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+ EXTRAMODULES='extramodules-3.10-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ rebuild_module_dependencies
+ echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
+ echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
+}
+post_upgrade() {
+ rebuild_module_dependencies
+}
+
+post_remove() {
+ rebuild_module_dependencies
+}
Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD 2013-07-22 13:43:08 UTC (rev 94374)
+++ community-testing-x86_64/PKGBUILD 2013-07-22 13:43:22 UTC (rev 94375)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
-# Contributor: Bob Fanger < bfanger(at)gmail >
-# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
-
-pkgname=r8168
-pkgver=8.036.00
-pkgrel=3
-pkgdesc="A kernel module for Realtek 8168 network cards"
-url="http://www.realtek.com.tw"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('glibc' 'linux')
-makedepends=('linux-headers')
-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)
-
- cd "$pkgname-$pkgver"
-
- # avoid using the Makefile directly -- it doesn't understand
- # any kernel but the current.
- make -C /usr/lib/modules/$KERNEL_RELEASE/build \
- SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
- EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
- modules
-}
-
-package() {
- _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
- depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
- KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
- msg "Kernel = $KERNEL_VERSION"
-
- cd "$pkgname-$pkgver"
- install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-
- sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
-}
-
-sha256sums=('937fd5d7d4cbfc95cf2859d8c3beb15a8536dc4e41752f7a53f2a25f07cdcd33'
- '1fb115b4d1b6b058d23322b89fad52d29748ce75b2774815e72c679a235d0e87')
Copied: r8168/repos/community-testing-x86_64/PKGBUILD (from rev 94374, r8168/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2013-07-22 13:43:22 UTC (rev 94375)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Bob Fanger < bfanger(at)gmail >
+# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
+
+pkgname=r8168
+pkgver=8.036.00
+pkgrel=3
+pkgdesc="A kernel module for Realtek 8168 network cards"
+url="http://www.realtek.com.tw"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('glibc' 'linux')
+makedepends=('linux-headers')
+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)
+
+ cd "$pkgname-$pkgver"
+
+ # avoid using the Makefile directly -- it doesn't understand
+ # any kernel but the current.
+ make -C /usr/lib/modules/$KERNEL_RELEASE/build \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+package() {
+ _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
+ depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
+ msg "Kernel = $KERNEL_VERSION"
+
+ cd "$pkgname-$pkgver"
+ install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
+}
+
+sha256sums=('937fd5d7d4cbfc95cf2859d8c3beb15a8536dc4e41752f7a53f2a25f07cdcd33'
+ '1fb115b4d1b6b058d23322b89fad52d29748ce75b2774815e72c679a235d0e87')
Deleted: community-testing-x86_64/linux-3.10.patch
===================================================================
--- community-testing-x86_64/linux-3.10.patch 2013-07-22 13:43:08 UTC (rev 94374)
+++ community-testing-x86_64/linux-3.10.patch 2013-07-22 13:43:22 UTC (rev 94375)
@@ -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
Copied: r8168/repos/community-testing-x86_64/linux-3.10.patch (from rev 94374, r8168/trunk/linux-3.10.patch)
===================================================================
--- community-testing-x86_64/linux-3.10.patch (rev 0)
+++ community-testing-x86_64/linux-3.10.patch 2013-07-22 13:43:22 UTC (rev 94375)
@@ -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
Deleted: community-testing-x86_64/r8168.install
===================================================================
--- community-testing-x86_64/r8168.install 2013-07-22 13:43:08 UTC (rev 94374)
+++ community-testing-x86_64/r8168.install 2013-07-22 13:43:22 UTC (rev 94375)
@@ -1,17 +0,0 @@
-rebuild_module_dependencies() {
- EXTRAMODULES='extramodules-3.10-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
- rebuild_module_dependencies
- echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
- echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
-}
-post_upgrade() {
- rebuild_module_dependencies
-}
-
-post_remove() {
- rebuild_module_dependencies
-}
Copied: r8168/repos/community-testing-x86_64/r8168.install (from rev 94374, r8168/trunk/r8168.install)
===================================================================
--- community-testing-x86_64/r8168.install (rev 0)
+++ community-testing-x86_64/r8168.install 2013-07-22 13:43:22 UTC (rev 94375)
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+ EXTRAMODULES='extramodules-3.10-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ rebuild_module_dependencies
+ echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
+ echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
+}
+post_upgrade() {
+ rebuild_module_dependencies
+}
+
+post_remove() {
+ rebuild_module_dependencies
+}
More information about the arch-commits
mailing list