Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=17498b19c045d8ccca1de3acab3988099797def5

commit 17498b19c045d8ccca1de3acab3988099797def5
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Sat Mar 13 17:26:36 2010 +0100

r8168-8.016.00-3-i686

- add kernel-2.6.33.patch

diff --git a/source/network-extra/r8168/FrugalBuild 
b/source/network-extra/r8168/FrugalBuild
index 9ed633f..b51a10c 100644
--- a/source/network-extra/r8168/FrugalBuild
+++ b/source/network-extra/r8168/FrugalBuild
@@ -4,16 +4,18 @@

pkgname=r8168
pkgver=8.016.00
-pkgrel=2
+pkgrel=3
Finclude kernel-module
pkgdesc="Realtek driver for RTL8111/RTL8168 cards."
url="http://www.realtek.com.tw";
groups=('network-extra')
archs=('i686' 'x86_64')
up2date="Flasttar http://code.google.com/p/arcon/downloads/list";
-source=(http://arcon.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 
README.Frugalware)
+source=(http://arcon.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 
README.Frugalware\
+       kernel-2.6.33.patch)
sha1sums=('1a6e3ee3c79de87d0a82e505feb6925f2ba1e7a9' \
-          'e13c36b76076d097a2dc9696a24024f816e8b3e2')
+          'e13c36b76076d097a2dc9696a24024f816e8b3e2' \
+          '0c4f13bdc307a5d0a81c691b85d92cdaaea28f05')

build() {
unset MAKEFLAGS
diff --git a/source/network-extra/r8168/kernel-2.6.33.patch 
b/source/network-extra/r8168/kernel-2.6.33.patch
new file mode 100644
index 0000000..4b630e9
--- /dev/null
+++ b/source/network-extra/r8168/kernel-2.6.33.patch
@@ -0,0 +1,54 @@
+From 55e59c4b905de2060b32b038032aa6d556f6cf9c Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmik...@frugalware.org>
+Date: Sat, 13 Mar 2010 17:21:59 +0100
+Subject: [PATCH] Convert ethtool get_stats_count() ops to get_sset_count()
+
+This string query operation was supposed to be replaced by the
+generic get_sset_count() starting in 2007.  Convert  r8168's
+implementation.
+---
+ src/r8168_n.c |   13 +++++++++----
+ 1 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/src/r8168_n.c b/src/r8168_n.c
+index 6bf88a7..05318ce 100644
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -306,7 +306,7 @@ struct _kc_ethtool_ops {
+       void (*self_test)(struct net_device *, struct ethtool_test *, u64 *);
+       void (*get_strings)(struct net_device *, u32 stringset, u8 *);
+       int  (*phys_id)(struct net_device *, u32);
+-      int  (*get_stats_count)(struct net_device *);
++      int  (*get_sset_count)(struct net_device *);
+       void (*get_ethtool_stats)(struct net_device *, struct ethtool_stats *,
+                                 u64 *);
+ } *ethtool_ops = NULL;
+@@ -1718,9 +1718,14 @@ struct rtl8168_counters {
+ };
+
+ static int
+-rtl8168_get_stats_count(struct net_device *dev)
++rtl8168_get_sset_count(struct net_device *dev, int stringset)
+ {
+-      return ARRAY_SIZE(rtl8168_gstrings);
++      switch (stringset) {
++      case ETH_SS_STATS:
++              return ARRAY_SIZE(rtl8168_gstrings);
++      default:
++              return -EINVAL;
++      }
+ }
+
+ static void
+@@ -1931,7 +1936,7 @@ static struct ethtool_ops rtl8168_ethtool_ops = {
+       .get_wol                = rtl8168_get_wol,
+       .set_wol                = rtl8168_set_wol,
+       .get_strings            = rtl8168_get_strings,
+-      .get_stats_count        = rtl8168_get_stats_count,
++      .get_sset_count         = rtl8168_get_sset_count,
+       .get_ethtool_stats      = rtl8168_get_ethtool_stats,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+ #ifdef ETHTOOL_GPERMADDR
+--
+1.7.0.2
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to