[Frugalware-git] kernel2635: madwifi-0.9.4-39-i686

Miklos Vajna vmiklos at frugalware.org
Tue Aug 3 00:33:59 CEST 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernel2635.git;a=commitdiff;h=1f4d0e47c3b83e8e1fc141bbdf4699a23b85c8c7

commit 1f4d0e47c3b83e8e1fc141bbdf4699a23b85c8c7
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Aug 3 00:33:45 2010 +0200

madwifi-0.9.4-39-i686

- add kernel-2.6.35.patch

diff --git a/source/network/madwifi/FrugalBuild b/source/network/madwifi/FrugalBuild
index 39e0b3a..e65807d 100644
--- a/source/network/madwifi/FrugalBuild
+++ b/source/network/madwifi/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=madwifi
pkgver=0.9.4
-pkgrel=38
+pkgrel=39
pkgdesc="Madwifi drivers for Atheros wireless chipsets"
Finclude kernel-module
depends=(${depends[@]} 'wireless_tools')
@@ -13,7 +13,7 @@ groups=('network')
archs=('i686' 'x86_64')
Finclude sourceforge
url="http://madwifi.sourceforge.net/"
-source=($source madwifi-0.9.3-cflags.diff kernel-2.6.2{6,7,9}.patch kernel-2.6.3{0,1,2,3}.patch)
+source=($source madwifi-0.9.3-cflags.diff kernel-2.6.2{6,7,9}.patch kernel-2.6.3{0,1,2,3,5}.patch)
sha1sums=('6f289cb2e99d27b23570d15b69bf0f4240e34d1e' \
'26fdc221e5bb0299d8b3c41ad30b6fe6882a8e35' \
'41928bbfdbb4e1c1fa5c1ed93fb673542c18bbc3' \
@@ -22,7 +22,8 @@ sha1sums=('6f289cb2e99d27b23570d15b69bf0f4240e34d1e' \
'8e9aef8b6d7fe815bb0816f107b65cda362d520e' \
'49e925f5a0a1705e9e9475f44f4005d6576fe51b' \
'e066b925df4e9119879fc23818c18ae62ef3008a' \
-          '9a5ceb3611a6eaadfc5f68003e31a62569754369')
+          '9a5ceb3611a6eaadfc5f68003e31a62569754369' \
+          '38c64a6599bd394c2a4f0eb2921fe122894050ae')

# If the package needs testing, feel free to poke Benjamin Woods <woodsb02 at gmail.com>

diff --git a/source/network/madwifi/kernel-2.6.35.patch b/source/network/madwifi/kernel-2.6.35.patch
new file mode 100644
index 0000000..4931cfb
--- /dev/null
+++ b/source/network/madwifi/kernel-2.6.35.patch
@@ -0,0 +1,40 @@
+--- a/ath/if_ath.c
++++ b/ath/if_ath.c
+@@ -4466,7 +4466,11 @@ ath_merge_mcast(struct ath_softc *sc, u_
+ {
+ 	struct ieee80211com *ic = &sc->sc_ic;
+ 	struct ieee80211vap *vap;
++	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++	struct netdev_hw_addr *ha;
++	#else
+ 	struct dev_mc_list *mc;
++	#endif
+ 	u_int32_t val;
+ 	u_int8_t pos;
+
+@@ -4474,6 +4478,17 @@ ath_merge_mcast(struct ath_softc *sc, u_
+ 	/* XXX locking */
+ 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
+ 		struct net_device *dev = vap->iv_dev;
++		#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
++		netdev_for_each_mc_addr(ha, dev) {
++			/* calculate XOR of eight 6-bit values */
++			val = LE_READ_4(ha->addr + 0);
++			pos = (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
++			val = LE_READ_4(ha->addr + 3);
++			pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val;
++			pos &= 0x3f;
++			mfilt[pos / 32] |= (1 << (pos % 32));
++		}
++		#else
+ 		for (mc = dev->mc_list; mc; mc = mc->next) {
+ 			/* calculate XOR of eight 6-bit values */
+ 			val = LE_READ_4(mc->dmi_addr + 0);
+@@ -4483,6 +4498,7 @@ ath_merge_mcast(struct ath_softc *sc, u_
+ 			pos &= 0x3f;
+ 			mfilt[pos / 32] |= (1 << (pos % 32));
+ 		}
++		#endif
+ 	}
+ }
+


More information about the Frugalware-git mailing list