Backported patch to 1.0.3, bug #96495.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 27 insertions, 4 deletions

diff --git a/net-wireless/ipw2200/ChangeLog b/net-wireless/ipw2200/ChangeLog
index 9d90015c219c..f4fa07cef68b 100644
--- a/net-wireless/ipw2200/ChangeLog
+++ b/net-wireless/ipw2200/ChangeLog
@@ -1,6 +1,10 @@
 # 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.34 2005/06/18 09:25:21 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ChangeLog,v 1.35 2005/06/20 10:26:41 brix Exp $
+
+  20 Jun 2005; <brix@gentoo.org>
+  +files/ipw2200-1.0.3-is_multicast_ether_addr.patch, ipw2200-1.0.3.ebuild:
+  Backported patch to 1.0.3, bug #96495.
 
   18 Jun 2005; <brix@gentoo.org>
   +files/ipw2200-1.0.4-is_multicast_ether_addr.patch, ipw2200-1.0.4.ebuild:
diff --git a/net-wireless/ipw2200/Manifest b/net-wireless/ipw2200/Manifest
index d5ca4dab21e1..98299dfc3dcc 100644
--- a/net-wireless/ipw2200/Manifest
+++ b/net-wireless/ipw2200/Manifest
@@ -1,8 +1,9 @@
 MD5 304f6cf7496078e2132d324412f88ea0 ipw2200-1.0.4.ebuild 2404
-MD5 a8a0786412470c1070966c7bfde040f6 ipw2200-1.0.3.ebuild 2388
-MD5 fb7680728be7234260918801a0605c88 ChangeLog 5983
+MD5 2e4345ff1436a7d3d07927fbb3749a37 ipw2200-1.0.3.ebuild 2443
+MD5 f827242b40dac6b02377326a953a4434 ChangeLog 6134
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 2dc4d1d726fc4dce22dee416d6028353 files/ipw2200-1.0.4-is_multicast_ether_addr.patch 647
+MD5 7a64b674dbd99046028827c6417409e1 files/ipw2200-1.0.3-is_multicast_ether_addr.patch 715
 MD5 ba6c39e9a44ef971292c5f8e6a7c6897 files/ipw2200-1.0.3-suspend2.patch 522
 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/ipw2200-1.0.3-is_multicast_ether_addr.patch b/net-wireless/ipw2200/files/ipw2200-1.0.3-is_multicast_ether_addr.patch
new file mode 100644
index 000000000000..0629b376ae2a
--- /dev/null
+++ b/net-wireless/ipw2200/files/ipw2200-1.0.3-is_multicast_ether_addr.patch
@@ -0,0 +1,17 @@
+diff -urp ipw2200-1.0.3/net/ieee80211.h ipw2200-1.0.3-is_multicast_ether_addr/net/ieee80211.h
+--- ipw2200-1.0.3/net/ieee80211.h	2005-04-08 23:36:51.000000000 +0200
++++ ipw2200-1.0.3-is_multicast_ether_addr/net/ieee80211.h	2005-06-20 12:22:48.000000000 +0200
+@@ -655,10 +655,12 @@ enum ieee80211_state {
+ #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
+ 
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+ extern inline int is_multicast_ether_addr(const u8 *addr)
+ {
+ 	return ((addr[0] != 0xff) && (0x01 & addr[0]));
+ }
++#endif
+ 
+ extern inline int is_broadcast_ether_addr(const u8 *addr)
+ {
+Only in ipw2200-1.0.3-is_multicast_ether_addr/net: ieee80211.h.orig
diff --git a/net-wireless/ipw2200/ipw2200-1.0.3.ebuild b/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
index 0c7ef631bc4a..31c0748fc286 100644
--- a/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
+++ b/net-wireless/ipw2200/ipw2200-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.3 2005/05/05 19:57:16 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2200/ipw2200-1.0.3.ebuild,v 1.4 2005/06/20 10:26:41 brix Exp $
 
 inherit eutils linux-mod
 
@@ -64,6 +64,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-suspend2.patch
+	epatch ${FILESDIR}/${P}-is_multicast_ether_addr.patch
 
 	use debug && debug="y"
 	sed -i \