new snapshot and added patch from madwifi mailing list which resolves corrupt frames on wlan0 when ath0 and wlan0 are in the same bridge

5 files changed, 90 insertions, 2 deletions

diff --git a/net-wireless/madwifi-driver/ChangeLog b/net-wireless/madwifi-driver/ChangeLog
index cc6a7626978c..e8ca3c65846e 100644
--- a/net-wireless/madwifi-driver/ChangeLog
+++ b/net-wireless/madwifi-driver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/madwifi-driver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.10 2004/06/25 00:46:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/ChangeLog,v 1.11 2004/07/26 16:12:29 solar Exp $
+
+*madwifi-driver-0.1_pre20040726 (26 Jul 2004)
+
+  26 Jul 2004; <solar@gentoo.org> madwifi-driver-0.1_pre20040726.ebuild,
+  files/madwifi-driver-0.1-arp-packets-33958.patch:
+  new snapshot and added patch from madwifi mailing list which resolves corrupt
+  frames on wlan0 when ath0 and wlan0 are in the same bridge
 
   15 May 2004; Peter Johanson <latexer@gentoo.org>
   madwifi-driver-0.1_pre20040514.ebuild:
diff --git a/net-wireless/madwifi-driver/Manifest b/net-wireless/madwifi-driver/Manifest
index ba78f19d9aec..900f3bfaed93 100644
--- a/net-wireless/madwifi-driver/Manifest
+++ b/net-wireless/madwifi-driver/Manifest
@@ -1,10 +1,13 @@
 MD5 03ec542fdd146f944e1cb042b2737b2b madwifi-driver-0.1_pre20040514.ebuild 1285
 MD5 e8cc8b03dd0e6004dcaa2ae40a865352 madwifi-driver-0.1_pre20040212.ebuild 1544
 MD5 bc0f5d0eb065e14e1c707944dd81ce38 madwifi-driver-0.1_pre20031213-r1.ebuild 1547
+MD5 be58ebf36bec5392ea894136194da368 madwifi-driver-0.1_pre20040726.ebuild 1445
 MD5 21d600ab4701f18262587bdd50415aa5 madwifi-driver-0.1_pre20040108.ebuild 1544
-MD5 2b39ba4931dff7b0d56e7f429d2215cd ChangeLog 2081
+MD5 ee3d7e2ded71e584b21466def17b85a6 ChangeLog 2395
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 MD5 e00b943f3c94116d21cae2f156eddb3f files/digest-madwifi-driver-0.1_pre20031213-r1 83
 MD5 87a16f54594ebda97e3ef6a9f64d798b files/digest-madwifi-driver-0.1_pre20040108 83
 MD5 b328239759561fb84caa9430f6d172ef files/digest-madwifi-driver-0.1_pre20040212 83
 MD5 e1ac8645264cff91daf51eb00fe88298 files/digest-madwifi-driver-0.1_pre20040514 84
+MD5 acd6d2fa40bd7e96da1df6529c506a81 files/digest-madwifi-driver-0.1_pre20040726 84
+MD5 444756b2062924ee7e0e631e956d46e9 files/madwifi-driver-0.1-arp-packets-33958.patch 704
diff --git a/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040726 b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040726
new file mode 100644
index 000000000000..93dd246123aa
--- /dev/null
+++ b/net-wireless/madwifi-driver/files/digest-madwifi-driver-0.1_pre20040726
@@ -0,0 +1 @@
+MD5 652469b415e280e82acb49f349260109 madwifi-driver-0.1_pre20040726.tar.bz2 1385453
diff --git a/net-wireless/madwifi-driver/files/madwifi-driver-0.1-arp-packets-33958.patch b/net-wireless/madwifi-driver/files/madwifi-driver-0.1-arp-packets-33958.patch
new file mode 100644
index 000000000000..0e86d25919ac
--- /dev/null
+++ b/net-wireless/madwifi-driver/files/madwifi-driver-0.1-arp-packets-33958.patch
@@ -0,0 +1,13 @@
+diff -Nrup madwifi-driver-0.1_pre20040514.orig/driver/if_ath.c madwifi-driver-0.1_pre20040514/driver/if_ath.c
+--- madwifi-driver-0.1_pre20040514.orig/driver/if_ath.c	2004-05-14 19:31:03.000000000 -0400
++++ madwifi-driver-0.1_pre20040514/driver/if_ath.c	2004-07-26 11:44:11.000000000 -0400
+@@ -759,7 +759,8 @@ ath_skbhdr_adjust(struct sk_buff *skb, s
+ 
+ 	if (ic->ic_flags & IEEE80211_F_WEPON)
+ 		len += IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN;
+-	if ((skb_headroom(skb) < len) &&
++	if (len < skb_headroom(skb)) len=skb_headroom(skb);
++	if ((skb_cloned(skb) || (skb_headroom(skb) < len)) &&
+ 	    pskb_expand_head(skb, len - skb_headroom(skb), 0, GFP_ATOMIC)) {
+ 		dev_kfree_skb(skb);
+ 		return -ENOMEM;
diff --git a/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040726.ebuild b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040726.ebuild
new file mode 100644
index 000000000000..39cf59f3930e
--- /dev/null
+++ b/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040726.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-driver/madwifi-driver-0.1_pre20040726.ebuild,v 1.1 2004/07/26 16:12:29 solar Exp $
+
+inherit eutils
+
+DESCRIPTION="Wireless driver for Atheros chipset a/b/g cards"
+HOMEPAGE="http://madwifi.sourceforge.net/"
+
+# Point to any required sources; these will be automatically downloaded by
+# Portage.
+SRC_URI="mirror://gentoo/$P.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~x86"
+IUSE=""
+DEPEND=""
+
+S=${WORKDIR}
+
+pkg_setup() {
+
+	if [[ "${KV}" > "2.5" ]] ; then
+		cd /usr/src/linux
+		./scripts/modpost ./vmlinux
+	fi
+
+}
+
+src_unpack() {
+	check_KV
+	unpack ${A}
+	cd ${S}
+	# http://sourceforge.net/mailarchive/forum.php?thread_id=5206227&forum_id=33958
+	epatch ${FILESDIR}/${PN}-0.1-arp-packets-33958.patch
+}
+
+src_compile() {
+	unset ARCH
+	make clean
+	make KERNELPATH="/usr/src/linux" KERNELRELEASE="${KV}" || die
+}
+
+src_install() {
+	unset ARCH
+	make KERNELPATH="/usr/src/linux" KERNELRELEASE="${KV}" \
+		DESTDIR="${D}" install || die
+
+	dodoc README
+}
+
+pkg_postinst() {
+
+	test -r "${ROOT}/usr/src/linux/System.map" && \
+		depmod -ae -F "${ROOT}/usr/src/linux/System.map" -b "${ROOT}" -r ${KV}
+
+	einfo ""
+	einfo "The madwifi drivers create an interface named 'athX'"
+	einfo "Create /etc/init.d/net.ath0 and add a line for athX"
+	einfo "in /etc/conf.d/net like 'iface_ath0=\"dhcp\"'"
+	einfo ""
+}