From: Henrik Brix Andersen <brix@gentoo.org>
Date: Wed, 19 Oct 2005 13:06:03 +0000 (+0000)
Subject: Allow compiling against non-WE-18 kernel.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bc7cdc3abf037d61354cd1ba52e9ab09e4c369f2;p=gentoo.git

Allow compiling against non-WE-18 kernel.
Package-Manager: portage-2.0.51.22-r3
---

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/Manifest b/net-wireless/ieee80211/Manifest
index 5223cbab51ff..dca148fcfc03 100644
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -1,9 +1,9 @@
 MD5 205ad9adc36c1538667c08b26290874b ieee80211-1.0.3.ebuild 2073
 MD5 0b37106be6c69fa6ce87d5925f2a31dc ieee80211-1.0.3-r1.ebuild 2093
 MD5 d94f6f0e594496b23768753d8f2fbccc ieee80211-1.0.2.ebuild 2067
-MD5 fe089eab954b956381dd6b641532a772 ieee80211-1.1.5.ebuild 2719
+MD5 8a53f6d174d515c629ee4ada4ab59a8a ieee80211-1.1.5.ebuild 2772
 MD5 85642481bdfb52cc037a57a742a59e18 ieee80211-1.0.3-r2.ebuild 2744
-MD5 8814d480b89a835f561aea3f8e692a5f ChangeLog 1702
+MD5 31613a7d8e4d45740cbfe9bb74a3494b ChangeLog 1862
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 54836c698b04ed62f6d7a3f6f8fa6232 ieee80211-1.0.1.ebuild 2067
 MD5 03afa38292ff5bbcc62500c4b6163888 files/ieee80211-1.0.3-broadcast.patch 622
@@ -11,6 +11,7 @@ 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
 MD5 27f61bbea47540d198a62c715e33a5b4 files/digest-ieee80211-1.1.5 63
+MD5 7efb5102c3a28d19a0be3fe7f1009d3c files/ieee80211-1.1.5-we18.patch 1826
 MD5 777627671d6848e14270d9f65d9d0be6 files/digest-ieee80211-1.0.3-r1 63
 MD5 777627671d6848e14270d9f65d9d0be6 files/digest-ieee80211-1.0.3-r2 63
 MD5 f6533e7149d244dd72eb444853266a8f files/ieee80211-1.0.3-keep_restricted_bit.patch 1220
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
 }