[Frugalware-git] wipv: r8169-6.010.00-15-i686

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=bcea1e5a0a3585c4fd1a9dd3cfdaa36ca813fea8

commit bcea1e5a0a3585c4fd1a9dd3cfdaa36ca813fea8
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Aug 3 00:41:19 2010 +0200

r8169-6.010.00-15-i686

- add kernel-2.6.35.patch

diff --git a/source/network-extra/r8169/FrugalBuild b/source/network-extra/r8169/FrugalBuild
index 94ec1f2..2b34d68 100644
--- a/source/network-extra/r8169/FrugalBuild
+++ b/source/network-extra/r8169/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=r8169
pkgver=6.010.00
-pkgrel=14
+pkgrel=15
Finclude sourceforge kernel-module
pkgdesc="Realtek driver for RTL8169/8110 cards."
url="http://www.realtek.com.tw"
@@ -11,11 +11,12 @@ groups=('network-extra')
archs=('i686' 'x86_64')
up2date="Flasttar ftp://WebUser:DAx7h9V@202.65.194.211/cn/nic/"
source=(ftp://WebUser:DAx7h9V@202.65.194.212/cn/nic/r8169-$pkgver.tar.bz2 \
-	kernel-2.6.3{0,1,3}.patch)
+	kernel-2.6.3{0,1,3,5}.patch)
sha1sums=('4a96f2abea67bf389235e35aab845439216d12fb' \
'fac6a84e1e027942339d5d692a03efe7ddce26d8' \
'1e14ec6ce2980f9c83d7b1ab247cd0ca6521e890' \
-          '07ae57dad0525d4bc9fd362ad43806c7b4b6a132')
+          '07ae57dad0525d4bc9fd362ad43806c7b4b6a132' \
+          '5d239187ddbb32b45991b162c7462006f59eccf7')

build() {
unset MAKEFLAGS
diff --git a/source/network-extra/r8169/kernel-2.6.35.patch b/source/network-extra/r8169/kernel-2.6.35.patch
new file mode 100644
index 0000000..15ea3ec
--- /dev/null
+++ b/source/network-extra/r8169/kernel-2.6.35.patch
@@ -0,0 +1,33 @@
+diff --git a/src/r8169_n.c b/src/r8169_n.c
+index 83e4755..110d644 100644
+--- a/src/r8169_n.c
++++ b/src/r8169_n.c
+@@ -3867,22 +3867,23 @@ rtl8169_set_rx_mode(struct net_device *dev)
+ 		    AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
+ 		    AcceptAllPhys;
+ 		mc_filter[1] = mc_filter[0] = 0xffffffff;
+-	} else if ((dev->mc_count > multicast_filter_limit)
++	} else if ((netdev_mc_count(dev) > multicast_filter_limit)
+ 		   || (dev->flags & IFF_ALLMULTI)) {
+ 		/* Too many to filter perfectly -- accept all multicasts. */
+
+ 		rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
+ 		mc_filter[1] = mc_filter[0] = 0xffffffff;
+ 	} else {
+-		struct dev_mc_list *mclist;
++		struct netdev_hw_addr *ha;
+
+ 		rx_mode = AcceptBroadcast | AcceptMyPhys;
+ 		mc_filter[1] = mc_filter[0] = 0;
+-		for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
+-		     i++, mclist = mclist->next) {
+-			int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
++		i = 0;
++		netdev_for_each_mc_addr(ha, dev) {
++			int bit_nr = ether_crc(ETH_ALEN, ha->addr) >> 26;
+ 			mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
+ 			rx_mode |= AcceptMulticast;
++			i++;
+ 		}
+ 	}
+