Updated pre-WE-18 patch.

Package-Manager: portage-2.0.51.22-r3

diff --git a/net-wireless/ieee80211/ChangeLog b/net-wireless/ieee80211/ChangeLog
index f3a4a6692293d6e60685b8461b5918fbda461f6e..a55009af6674d278d9c6334cf77a068a6037cb1f 100644 (file)
--- 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.11 2005/10/19 13:06:03 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ieee80211/ChangeLog,v 1.12 2005/10/19 19:40:19 brix Exp $
+
+  19 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
+  files/ieee80211-1.1.5-we18.patch:
+  Updated pre-WE-18 patch.
 
   19 Oct 2005; Henrik Brix Andersen <brix@gentoo.org>
   +files/ieee80211-1.1.5-we18.patch, ieee80211-1.1.5.ebuild:

diff --git a/net-wireless/ieee80211/Manifest b/net-wireless/ieee80211/Manifest
index dca148fcfc0316aad567f306cca763010606786d..148b5df0beac0b1f765687d402c637e3a93a1cbc 100644 (file)
--- a/net-wireless/ieee80211/Manifest
+++ b/net-wireless/ieee80211/Manifest
@@ -3,7 +3,7 @@ MD5 0b37106be6c69fa6ce87d5925f2a31dc ieee80211-1.0.3-r1.ebuild 2093
 MD5 d94f6f0e594496b23768753d8f2fbccc ieee80211-1.0.2.ebuild 2067
 MD5 8a53f6d174d515c629ee4ada4ab59a8a ieee80211-1.1.5.ebuild 2772
 MD5 85642481bdfb52cc037a57a742a59e18 ieee80211-1.0.3-r2.ebuild 2744
-MD5 31613a7d8e4d45740cbfe9bb74a3494b ChangeLog 1862
+MD5 2a871ad38f52be60a38a23f7b13a8863 ChangeLog 1980
 MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
 MD5 54836c698b04ed62f6d7a3f6f8fa6232 ieee80211-1.0.1.ebuild 2067
 MD5 03afa38292ff5bbcc62500c4b6163888 files/ieee80211-1.0.3-broadcast.patch 622
@@ -11,7 +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 ccf8b6ee79df516fce26c5780b058ac6 files/ieee80211-1.1.5-we18.patch 1973
 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
index d1a1f9fe1f7e59de477746d3ea9bbb4965eb43e4..b8510de7c28d4be8714668739c7dbfa3e36fb317 100644 (file)
--- a/net-wireless/ieee80211/files/ieee80211-1.1.5-we18.patch
+++ b/net-wireless/ieee80211/files/ieee80211-1.1.5-we18.patch
@@ -1,6 +1,31 @@
-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
+diff --git a/net/ieee80211.h b/net/ieee80211.h
+--- a/net/ieee80211.h
++++ b/net/ieee80211.h
+@@ -29,6 +29,21 @@
+ #include <linux/kernel.h>     /* ARRAY_SIZE */
+ #include <linux/wireless.h>
+ 
++#if WIRELESS_EXT < 18
++#define IW_QUAL_QUAL_UPDATED    0x01    /* Value was updated since last read */
++#define IW_QUAL_LEVEL_UPDATED   0x02
++#define IW_QUAL_NOISE_UPDATED   0x04
++#define IW_QUAL_ALL_UPDATED     0x07
++#define IW_QUAL_QUAL_INVALID    0x10    /* Driver doesn't provide value */
++#define IW_QUAL_LEVEL_INVALID   0x20
++#define IW_QUAL_NOISE_INVALID   0x40
++#define IW_QUAL_ALL_INVALID     0x70
++#endif
++
++#if WIRELESS_EXT < 19
++#define IW_QUAL_DBM             0x08    /* Level + Noise are dBm */
++#endif
++
+ #define IEEE80211_VERSION "1.1.5"
+ 
+ #define IEEE80211_DATA_LEN            2304
+diff --git a/ieee80211_crypt_tkip.c b/ieee80211_crypt_tkip.c
+--- a/ieee80211_crypt_tkip.c
++++ b/ieee80211_crypt_tkip.c
 @@ -555,6 +555,7 @@ static void ieee80211_michael_mic_failur
                                          struct ieee80211_hdr_4addr *hdr,
                                          int keyidx)
@@ -17,21 +42,10 @@ diff -Nup ieee80211-1.1.5-orig/ieee80211_crypt_tkip.c ieee80211-1.1.5/ieee80211_
  }
  
  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
+diff --git a/ieee80211_wx.c b/ieee80211_wx.c
+--- a/ieee80211_wx.c
++++ b/ieee80211_wx.c
+@@ -488,6 +488,7 @@ int ieee80211_wx_get_encode(struct ieee8
        return 0;
  }
  
@@ -39,7 +53,7 @@ diff -Nup ieee80211-1.1.5-orig/ieee80211_wx.c ieee80211-1.1.5/ieee80211_wx.c
  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
+@@ -721,6 +722,7 @@ int ieee80211_wx_get_encodeext(struct ie
  
  EXPORT_SYMBOL(ieee80211_wx_set_encodeext);
  EXPORT_SYMBOL(ieee80211_wx_get_encodeext);
@@ -47,4 +61,3 @@ diff -Nup ieee80211-1.1.5-orig/ieee80211_wx.c ieee80211-1.1.5/ieee80211_wx.c
  
  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