Allow compiling against older kernels, bug #113155.

Package-Manager: portage-2.0.53

4 files changed, 45 insertions, 5 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index 81d1bdb28b54..5ec35b45a191 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ieee80211
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.22 2006/01/09 11:24:29 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.23 2006/01/11 12:28:56 brix Exp $
+
+  11 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ieee80211-1.1.8-nocast.patch, ieee80211-1.1.8.ebuild:
+  Allow compiling against older kernels, bug #113155.
 
 *ieee80211-1.1.8 (09 Jan 2006)
 
diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest
index a52b1993e314..ceacc4119c6b 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,4 +1,4 @@
-MD5 a9ba889d99e5becc222ef378046d9a8f ChangeLog 3776
+MD5 62cfd6a1e4b01b30f9ccd0730f442ab0 ChangeLog 3948
 MD5 cc0dea5fff30f8ea5fe5e62a749115d3 files/digest-ieee80211-1.0.1 63
 MD5 affd67ec6900c1e7f9c123969f709181 files/digest-ieee80211-1.0.2 63
 MD5 777627671d6848e14270d9f65d9d0be6 files/digest-ieee80211-1.0.3 63
@@ -14,6 +14,7 @@ MD5 f6533e7149d244dd72eb444853266a8f files/ieee80211-1.0.3-keep_restricted_bit.p
 MD5 d2bada5c8bb423cb02a88cc4f0011d39 files/ieee80211-1.0.3-open_frag.patch 2638
 MD5 61bac627a89e0cafb9996d2887d8a3e9 files/ieee80211-1.1.5-broadcast.patch 1939
 MD5 ccf8b6ee79df516fce26c5780b058ac6 files/ieee80211-1.1.5-we18.patch 1973
+MD5 4c49e8e5e739551dd8a68f88131529a4 files/ieee80211-1.1.8-nocast.patch 959
 MD5 0f05f4c35985b633ec476e01c1f4b4d1 files/remove-old 1362
 MD5 1054af781be5183132744e65a5043a8d ieee80211-1.0.1.ebuild 2768
 MD5 c09bd847f99062b5e22ebe9f8976a49c ieee80211-1.0.2.ebuild 2768
@@ -24,5 +25,5 @@ MD5 71c6e2c242e709e0649b534c96736d25 ieee80211-1.1.5-r1.ebuild 2872
 MD5 49f0d303a477f0b091dd498e02576a5b ieee80211-1.1.5.ebuild 2828
 MD5 42dbbe85c5f5dd959a3da2fa12c4df9e ieee80211-1.1.6.ebuild 2779
 MD5 0dadded27c72eb389fecc48bc9b94604 ieee80211-1.1.7.ebuild 2787
-MD5 3047954525b15bb8e4aa7b830a98d5d4 ieee80211-1.1.8.ebuild 2787
+MD5 eca48471432047fdb5f0a23aaebecf97 ieee80211-1.1.8.ebuild 2844
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
diff --git a/net-wireless/ieee80211/files/ieee80211-1.1.8-nocast.patch b/net-wireless/ieee80211/files/ieee80211-1.1.8-nocast.patch
new file mode 100644
index 000000000000..318844ed680a
--- /dev/null
+++ b/net-wireless/ieee80211/files/ieee80211-1.1.8-nocast.patch
@@ -0,0 +1,32 @@
+diff -urp ieee80211-1.1.8/ieee80211_tx.c ieee80211-1.1.8-fix/ieee80211_tx.c
+--- ieee80211-1.1.8/ieee80211_tx.c	2006-01-09 14:24:53.000000000 +0800
++++ ieee80211-1.1.8-fix/ieee80211_tx.c	2006-01-10 13:17:00.000000000 +0800
+@@ -49,12 +49,6 @@
+ #define NETDEV_TX_BUSY 1
+ #endif
+ 
+-/* Fix for kernels < 2.6.12, since we use __nocast */
+-#ifndef __nocast
+-#define __nocast
+-#endif
+-
+-
+ /*
+ 
+ 802.11 Data Frame
+diff -urp ieee80211-1.1.8/net/ieee80211.h ieee80211-1.1.8-fix/net/ieee80211.h
+--- ieee80211-1.1.8/net/ieee80211.h	2006-01-09 14:24:53.000000000 +0800
++++ ieee80211-1.1.8-fix/net/ieee80211.h	2006-01-10 13:17:00.000000000 +0800
+@@ -1141,6 +1141,12 @@ static inline int is_multicast_ether_add
+        return addr[0] & 0x01;
+ }
+ #endif
++
++/* Fix for kernels < 2.6.12, since we use __nocast */
++#ifndef __nocast
++#define __nocast
++#endif
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+ static inline void *kzalloc(size_t size, unsigned __nocast flags)
+ {
diff --git a/net-wireless/ieee80211/ieee80211-1.1.8.ebuild b/net-wireless/ieee80211/ieee80211-1.1.8.ebuild
index 24294898cb97..4d9c52053ae8 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.8.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.8.ebuild,v 1.2 2006/01/09 13:26:42 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.8.ebuild,v 1.3 2006/01/11 12:28:56 brix Exp $
 
-inherit linux-mod
+inherit eutils linux-mod
 
 # The following works with both pre-releases and releases
 MY_P=${P/_/-}
@@ -72,6 +72,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-nocast.patch
+
 	use debug && debug="y"
 	sed -i -e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile || die
 }