rpms/kernel/devel git-wireless-dev-fixes.patch, NONE, 1.1 kernel-2.6.spec, 1.3055, 1.3056

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5040

Modified Files:
	kernel-2.6.spec 
Added Files:
	git-wireless-dev-fixes.patch 
Log Message:


git-wireless-dev-fixes.patch:
 ieee80211_ioctl.c |    5 ++++-
 ieee80211_sta.c   |   40 ++++++++++------------------------------
 2 files changed, 14 insertions(+), 31 deletions(-)

--- NEW FILE git-wireless-dev-fixes.patch ---
--- linux-2.6.20.noarch/net/mac80211/ieee80211_ioctl.c.orig	2007-04-05 16:55:15.000000000 -0400
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_ioctl.c	2007-04-05 17:09:38.000000000 -0400
@@ -1585,7 +1585,7 @@ static int ieee80211_ioctl_giwrange(stru
 	memset(range, 0, sizeof(struct iw_range));
 
 	range->we_version_compiled = WIRELESS_EXT;
-	range->we_version_source = 14;
+	range->we_version_source = 21;
 	range->retry_capa = IW_RETRY_LIMIT;
 	range->retry_flags = IW_RETRY_LIMIT;
 	range->min_retry = 0;
@@ -1605,6 +1605,9 @@ static int ieee80211_ioctl_giwrange(stru
 	range->avg_qual.noise = 0;
 	range->avg_qual.updated = local->wstats_flags;
 
+	range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 |
+			  IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP;
+
 	return 0;
 }
 
--- linux-2.6.20.noarch/net/mac80211/ieee80211_sta.c.orig	2007-04-05 16:55:16.000000000 -0400
+++ linux-2.6.20.noarch/net/mac80211/ieee80211_sta.c	2007-04-05 17:09:17.000000000 -0400
@@ -2781,39 +2781,19 @@ ieee80211_sta_scan_result(struct net_dev
 	current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
 
 	if (bss && bss->wpa_ie) {
-		char *buf, *p;
-		int i;
-		buf = kmalloc(30 + bss->wpa_ie_len * 2, GFP_ATOMIC);
-		if (buf) {
-			p = buf;
-			p += sprintf(p, "wpa_ie=");
-			for (i = 0; i < bss->wpa_ie_len; i++)
-				p+= sprintf(p, "%02x", bss->wpa_ie[i]);
-			memset(&iwe, 0, sizeof(iwe));
-			iwe.cmd = IWEVCUSTOM;
-			iwe.u.data.length = strlen(buf);
-			current_ev = iwe_stream_add_point(current_ev, end_buf,
-							  &iwe, buf);
-			kfree(buf);
-		}
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVGENIE;
+		iwe.u.data.length = bss->wpa_ie_len;
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  bss->wpa_ie);
 	}
 
 	if (bss && bss->rsn_ie) {
-		char *buf, *p;
-		int i;
-		buf = kmalloc(30 + bss->rsn_ie_len * 2, GFP_ATOMIC);
-		if (buf) {
-			p = buf;
-			p += sprintf(p, "rsn_ie=");
-			for (i = 0; i < bss->rsn_ie_len; i++)
-				p+= sprintf(p, "%02x", bss->rsn_ie[i]);
-			memset(&iwe, 0, sizeof(iwe));
-			iwe.cmd = IWEVCUSTOM;
-			iwe.u.data.length = strlen(buf);
-			current_ev = iwe_stream_add_point(current_ev, end_buf,
-							  &iwe, buf);
-			kfree(buf);
-		}
+		memset(&iwe, 0, sizeof(iwe));
+		iwe.cmd = IWEVGENIE;
+		iwe.u.data.length = bss->rsn_ie_len;
+		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
+						  bss->rsn_ie);
 	}
 
 	if (bss) {


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3055
retrieving revision 1.3056
diff -u -r1.3055 -r1.3056
--- kernel-2.6.spec	10 Apr 2007 14:20:44 -0000	1.3055
+++ kernel-2.6.spec	10 Apr 2007 18:09:20 -0000	1.3056
@@ -378,17 +378,18 @@
 Patch10: linux-2.6-utrace.patch
 Patch11: nouveau-drm.patch
 Patch12: git-wireless-dev.patch
-Patch13: git-iwlwifi.patch
-Patch14: git-iwlwifi-fixes.patch
-Patch15: linux-2.6-rt2x00-scan-fix.patch
-
-Patch16: linux-2.6-fix-pmops-1.patch
-Patch17: linux-2.6-fix-pmops-2.patch
-Patch18: linux-2.6-fix-pmops-3.patch
-Patch19: linux-2.6-fix-pmops-4.patch
+Patch13: git-wireless-dev-fixes.patch
+Patch14: git-iwlwifi.patch
+Patch15: git-iwlwifi-fixes.patch
+Patch16: linux-2.6-rt2x00-scan-fix.patch
+
+Patch17: linux-2.6-fix-pmops-1.patch
+Patch18: linux-2.6-fix-pmops-2.patch
+Patch19: linux-2.6-fix-pmops-3.patch
+Patch20: linux-2.6-fix-pmops-4.patch
 
 # enable sysrq-c on all kernels, not only kexec
-Patch20: linux-2.6-sysrq-c.patch
+Patch21: linux-2.6-sysrq-c.patch
 
 # Patches 100 through 500 are meant for architecture patches
 
@@ -974,20 +975,22 @@
 
 # Add the new wireless stack and drivers from wireless-dev
 %patch12 -p1
-# ...and the iwlwifi driver from Intel
+# ...plus some fixes not yet in the wireless-dev tree
 %patch13 -p1
-# ...plus some fixes not yet in Intel's tree
+# ...and the iwlwifi driver from Intel
 %patch14 -p1
-# fix up scanning in rt2x00
+# ...plus some fixes not yet in Intel's tree
 %patch15 -p1
-# Power management fixes
+# fix up scanning in rt2x00
 %patch16 -p1
+# Power management fixes
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 # sysrq works always
-%patch20 -p1
+%patch21 -p1
 
 # Architecture patches
 
@@ -2249,6 +2252,9 @@
 #  - tux.
 
 %changelog
+* Tue Apr 10 2007 John W. Linville <linville at redhat.com>
+- Add fix for using WPA with mac80211 drivers
+
 * Tue Apr 10 2007 Dave Jones <davej at redhat.com>
 - 2.6.21-rc6-git3