Fix DHCP issues with some Access Points.

(Portage version: 2.0.51.22-r2)

5 files changed, 122 insertions, 2 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index 59d50645ded3..a4d0d5ec4787 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/ipw2200
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.42 2005/08/29 20:02:10 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.43 2005/09/02 17:34:44 brix Exp $
+
+*ipw2200-1.0.6-r2 (02 Sep 2005)
+
+  02 Sep 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ipw2200-1.0.6-broadcast.patch, +ipw2200-1.0.6-r2.ebuild:
+  Fix DHCP issues with some Access Points.
 
 *ipw2200-1.0.6-r1 (29 Aug 2005)
 
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index 7057b65c1547..55ec0c1d021e 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -1,10 +1,11 @@
 MD5 03551f14b4409796623fb865ed2abf97 ipw2200-1.0.4.ebuild 2449
 MD5 7afca8db2613b9fc32d5f7005b4db15d ipw2200-1.0.6.ebuild 2158
 MD5 a1d82c4728a3f608b762fe63c4910f42 ipw2200-1.0.1.ebuild 2488
+MD5 f2d83c8a1f88449ac4ff5f089d04e0d9 ipw2200-1.0.6-r2.ebuild 2200
 MD5 b2138b76ba85eeea301d8fa9f72470df ipw2200-1.0.3.ebuild 2488
 MD5 8a1b21691e17dc6de38c7238cd4e4522 ipw2200-1.0.5.ebuild 2145
 MD5 7453a3247e41a7bf8c6e939cf55c45f0 ipw2200-1.0.6-r1.ebuild 2260
-MD5 c9ecaa12f13b8d289f63ed4fb95744f8 ChangeLog 7186
+MD5 26fa5e3362e932bd2da4228365977f81 ChangeLog 7383
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 2dc4d1d726fc4dce22dee416d6028353 files/ipw2200-1.0.4-is_multicast_ether_addr.patch 647
 MD5 abdb4f9be556bd09fe711f6a7cd42ee2 files/ipw2200-1.0.6-suspend2.patch 520
@@ -12,8 +13,10 @@ MD5 2ba8f54679172b49a799779c1a02127a files/ipw2200-1.0.6-hwcrypt-wpa-fix4.patch
 MD5 9e25eeda7c745bca8c5cf72537dd31f5 files/ipw2200-1.0.1-suspend2.patch 448
 MD5 af6756863c64cdfc93cd53556f8b397b files/ipw2200-1.0.1-is_multicast_ether_addr.patch 631
 MD5 7a64b674dbd99046028827c6417409e1 files/ipw2200-1.0.3-is_multicast_ether_addr.patch 715
+MD5 2833c1b240e20a5b7ecb45f5435cf24f files/ipw2200-1.0.6-broadcast.patch 992
 MD5 ba6c39e9a44ef971292c5f8e6a7c6897 files/ipw2200-1.0.3-suspend2.patch 522
 MD5 aab93fcc37b1a1282d7a02e9b64430a3 files/digest-ipw2200-1.0.6-r1 62
+MD5 aab93fcc37b1a1282d7a02e9b64430a3 files/digest-ipw2200-1.0.6-r2 62
 MD5 d2a1aca212498ad4de9f4a79ac12026b files/digest-ipw2200-1.0.1 62
 MD5 1953868cbb8ae6ee8eee55c5848417ab files/digest-ipw2200-1.0.3 62
 MD5 bcf142294729f1a55d7b3fd29c1a8239 files/digest-ipw2200-1.0.4 62
diff --git a/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r2 b/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r2
new file mode 100644
index 000000000000..53844e808285
--- /dev/null
+++ b/net-wireless/ipw2200/files/digest-ipw2200-1.0.6-r2
@@ -0,0 +1 @@
+MD5 d49f301ce8cffbd1cfbdb51061df3ac8 ipw2200-1.0.6.tgz 112932
diff --git a/net-wireless/ipw2200/files/ipw2200-1.0.6-broadcast.patch b/net-wireless/ipw2200/files/ipw2200-1.0.6-broadcast.patch
new file mode 100644
index 000000000000..28061f84af28
--- /dev/null
+++ b/net-wireless/ipw2200/files/ipw2200-1.0.6-broadcast.patch
@@ -0,0 +1,23 @@
+diff -urp ipw2200-1.0.6/ipw2200.c ipw2200-1.0.6-broadcast/ipw2200.c
+--- ipw2200-1.0.6/ipw2200.c	2005-07-13 21:00:28.000000000 +0200
++++ ipw2200-1.0.6-broadcast/ipw2200.c	2005-09-02 19:15:03.000000000 +0200
+@@ -7669,7 +7669,8 @@ static inline int is_network_packet(stru
+ 			return 0;
+ 
+ 		/* multicast packets to our IBSS go through */
+-		if (is_multicast_ether_addr(header->addr1))
++		if (is_multicast_ether_addr(header->addr1) ||
++                    is_broadcast_ether_addr(header->addr1))
+ 			return !memcmp(header->addr3, priv->bssid, ETH_ALEN);
+ 
+ 		/* packets to our adapter go through */
+@@ -7682,7 +7683,8 @@ static inline int is_network_packet(stru
+ 			return 0;
+ 
+ 		/* {broad,multi}cast packets to our IBSS go through */
+-		if (is_multicast_ether_addr(header->addr1))
++		if (is_multicast_ether_addr(header->addr1) ||
++                    is_broadcast_ether_addr(header->addr1))
+ 			return !memcmp(header->addr2, priv->bssid, ETH_ALEN);
+ 
+ 		/* packets to our adapter go through */
diff --git a/net-wireless/ipw2200/ipw2200-1.0.6-r2.ebuild b/net-wireless/ipw2200/ipw2200-1.0.6-r2.ebuild
new file mode 100644
index 000000000000..c0cb947978af
--- /dev/null
+++ b/net-wireless/ipw2200/ipw2200-1.0.6-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.6-r2.ebuild,v 1.1 2005/09/02 17:34:44 brix Exp $
+
+inherit eutils linux-mod
+
+# The following works with both pre-releases and releases
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+IEEE80211_VERSION="1.0.3-r1"
+FW_VERSION="2.3"
+
+DESCRIPTION="Driver for the Intel PRO/Wireless 2200BG/2915ABG miniPCI and 2225BG PCI adapters"
+HOMEPAGE="http://ipw2200.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug"
+DEPEND=">=net-wireless/ieee80211-${IEEE80211_VERSION}"
+RDEPEND="${DEPEND}
+		=net-wireless/ipw2200-firmware-${FW_VERSION}
+		net-wireless/wireless-tools"
+
+BUILD_TARGETS="all"
+MODULE_NAMES="ipw2200(net/wireless:)"
+MODULESD_IPW2200_DOCS="README.ipw2200"
+
+CONFIG_CHECK="NET_RADIO FW_LOADER"
+ERROR_NET_RADIO="${P} requires support for Wireless LAN drivers (non-hamradio) & Wireless Extensions (CONFIG_NET_RADIO)."
+ERROR_FW_LOADER="${P} requires Hotplug firmware loading support (CONFIG_FW_LOADER)."
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	if kernel_is 2 4; then
+		die "${P} does not support building against kernel 2.4.x"
+	fi
+
+	BUILD_PARAMS="KSRC=${KV_DIR} KSRC_OUTPUT=${KV_OUT_DIR} IEEE80211_INC=/usr/include"
+}
+
+src_unpack() {
+	local debug="n"
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-hwcrypt-wpa-fix4.patch
+	epatch ${FILESDIR}/${P}-suspend2.patch
+	epatch ${FILESDIR}/${P}-broadcast.patch
+
+	use debug && debug="y"
+	sed -i -e "s:^\(CONFIG_IPW_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
+}
+
+src_compile() {
+	einfo
+	einfo "You may safely ignore any errors from compilation that contain"
+	einfo "warnings about undefined references to the ieee80211 subsystem."
+	einfo
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc CHANGES ISSUES
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	if [ -f /lib/modules/${KV_FULL}/net/${PN}.ko ]; then
+		einfo
+		einfo "Modules from an earlier installation detected. You will need to manually"
+		einfo "remove those modules by running the following commands:"
+		einfo "  # rm -f /lib/modules/${KV_FULL}/net/${PN}.ko"
+		einfo "  # rm -f /lib/modules/${KV_FULL}/net/ieee80211*.ko"
+		einfo "  # depmod -a"
+		einfo
+	fi
+}