Allow compiling against non-WE-18 kernel.

(Portage version: 2.0.51.22-r3)

3 files changed, 60 insertions, 3 deletions

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index 0167981815a0..f3a4a6692293 100644
--- a/net-wireless/ieee80211/ChangeLog
+++ b/net-wireless/ieee80211/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/ieee80211
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.10 2005/10/18 18:21:26 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.11 2005/10/19 13:06:03 brix Exp $
+
+  19 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  +files/ieee80211-1.1.5-we18.patch, ieee80211-1.1.5.ebuild:
+  Allow compiling against non-WE-18 kernel.
 
 *ieee80211-1.1.5 (18 Oct 2005)
 
diff --git a/net-wireless/ieee80211/files/ieee80211-1.1.5-we18.patch b/net-wireless/ieee80211/files/ieee80211-1.1.5-we18.patch
new file mode 100644
index 000000000000..d1a1f9fe1f7e
--- /dev/null
+++ b/net-wireless/ieee80211/files/ieee80211-1.1.5-we18.patch
@@ -0,0 +1,50 @@
+diff -Nup ieee80211-1.1.5-orig/ieee80211_crypt_tkip.c ieee80211-1.1.5/ieee80211_crypt_tkip.c
+--- ieee80211-1.1.5-orig/ieee80211_crypt_tkip.c	2005-10-13 13:12:12.000000000 -0500
++++ ieee80211-1.1.5/ieee80211_crypt_tkip.c	2005-10-18 14:31:51.000000000 -0500
+@@ -555,6 +555,7 @@ static void ieee80211_michael_mic_failur
+ 					  struct ieee80211_hdr_4addr *hdr,
+ 					  int keyidx)
+ {
++#if WIRELESS_EXT >= 18
+ 	union iwreq_data wrqu;
+ 	struct iw_michaelmicfailure ev;
+ 
+@@ -570,6 +571,7 @@ static void ieee80211_michael_mic_failur
+ 	memset(&wrqu, 0, sizeof(wrqu));
+ 	wrqu.data.length = sizeof(ev);
+ 	wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *)&ev);
++#endif
+ }
+ 
+ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
+diff -Nup ieee80211-1.1.5-orig/ieee80211_wx.c ieee80211-1.1.5/ieee80211_wx.c
+--- ieee80211-1.1.5-orig/ieee80211_wx.c	2005-10-13 13:12:12.000000000 -0500
++++ ieee80211-1.1.5/ieee80211_wx.c	2005-10-18 14:31:51.000000000 -0500
+@@ -41,6 +41,10 @@ static const char *ieee80211_modes[] = {
+ 	"?", "a", "b", "ab", "g", "ag", "bg", "abg"
+ };
+ 
++#if WIRELESS_EXT < 17
++
++#endif
++
+ #define MAX_CUSTOM_LEN 64
+ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
+ 					   char *start, char *stop,
+@@ -488,6 +492,7 @@ int ieee80211_wx_get_encode(struct ieee8
+ 	return 0;
+ }
+ 
++#if WIRELESS_EXT >= 18
+ int ieee80211_wx_set_encodeext(struct ieee80211_device *ieee,
+ 			       struct iw_request_info *info,
+ 			       union iwreq_data *wrqu, char *extra)
+@@ -721,6 +726,7 @@ int ieee80211_wx_get_encodeext(struct ie
+ 
+ EXPORT_SYMBOL(ieee80211_wx_set_encodeext);
+ EXPORT_SYMBOL(ieee80211_wx_get_encodeext);
++#endif
+ 
+ EXPORT_SYMBOL(ieee80211_wx_get_scan);
+ EXPORT_SYMBOL(ieee80211_wx_set_encode);
+Common subdirectories: ieee80211-1.1.5-orig/net and ieee80211-1.1.5/net
diff --git a/net-wireless/ieee80211/ieee80211-1.1.5.ebuild b/net-wireless/ieee80211/ieee80211-1.1.5.ebuild
index db73c877aa7d..ca2ce4f4a18c 100644
--- a/net-wireless/ieee80211/ieee80211-1.1.5.ebuild
+++ b/net-wireless/ieee80211/ieee80211-1.1.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.5.ebuild,v 1.1 2005/10/18 18:21:26 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ieee80211-1.1.5.ebuild,v 1.2 2005/10/19 13:06:03 brix Exp $
 
-inherit linux-mod
+inherit eutils linux-mod
 
 # The following works with both pre-releases and releases
 MY_P=${P/_/-}
@@ -71,6 +71,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/${P}-we18.patch
+
 	use debug && debug="y"
 	sed -i -e "s:^\(CONFIG_IEEE80211_DEBUG\)=.*:\1=${debug}:" ${S}/Makefile
 }