rpms/kernel/F-11 hostap-revert-toxic-part-of-conversion.patch, NONE, 1.1 kernel.spec, 1.1740, 1.1741

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27988

Modified Files:
	kernel.spec 
Added Files:
	hostap-revert-toxic-part-of-conversion.patch 
Log Message:
Fix breakage in hostap driver (#522269)

hostap-revert-toxic-part-of-conversion.patch:
 hostap_main.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE hostap-revert-toxic-part-of-conversion.patch ---
From: Martin Decky <martin at decky.cz>
Date: Thu, 10 Sep 2009 01:44:47 +0000 (+0200)
Subject: hostap: Revert a toxic part of the conversion to net_device_ops
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=e484c16f6212f7f06407382efa4d3ad214b6c589

hostap: Revert a toxic part of the conversion to net_device_ops

As the hostap driver was converted to use net_device_ops, a mistake was
made in hostap_main.c (commit 5ae4efbcd2611562a8b93596be034e63495706a5).
Originally, the tx_queue_len was set to 0 for every other interface than
HOSTAP_INTERFACE_MASTER, but the new fragment of code sets tx_queue_len to
0 only for HOSTAP_INTERFACE_MASTER. The opposite of the previous
behavior makes the driver to drop all packets in AP mode.

Change the way 0 is assigned to tx_queue_len according to the original
logic.

Signed-off-by: Martin Decky <martin at decky.cz>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---

diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 6fe122f..eb57d1e 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -875,15 +875,16 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
 
 	switch(type) {
 	case HOSTAP_INTERFACE_AP:
+		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_mgmt_netdev_ops;
 		dev->type = ARPHRD_IEEE80211;
 		dev->header_ops = &hostap_80211_ops;
 		break;
 	case HOSTAP_INTERFACE_MASTER:
-		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_master_ops;
 		break;
 	default:
+		dev->tx_queue_len = 0;	/* use main radio device queue */
 		dev->netdev_ops = &hostap_netdev_ops;
 	}
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1740
retrieving revision 1.1741
diff -u -p -r1.1740 -r1.1741
--- kernel.spec	24 Sep 2009 21:28:01 -0000	1.1740
+++ kernel.spec	25 Sep 2009 04:12:11 -0000	1.1741
@@ -746,6 +746,9 @@ Patch14090: linux-2.6-xen-rearrange-to-f
 Patch14100: linux-2.6-cpufreq-eliminate-lockdep-warnings.patch
 Patch14101: linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch
 
+# fix hostap (#522269)
+Patch14200: hostap-revert-toxic-part-of-conversion.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1368,7 +1371,7 @@ ApplyPatch linux-2.6-virtio_blk-dont-bou
 
 ApplyPatch make-mmap_min_addr-suck-less.patch
 
-# ----- send for upstream inclusion -----
+# ----- sent for upstream inclusion -----
 ApplyPatch linux-2.6-cifs-reenable-lanman-security.patch
 
 # ----- patches headed for -stable -----
@@ -1387,6 +1390,9 @@ ApplyPatch linux-2.6-xen-rearrange-to-fi
 ApplyPatch linux-2.6-cpufreq-eliminate-lockdep-warnings.patch
 ApplyPatch linux-2.6-cpufreq-cleanup-locking-in-ondemand.patch
 
+# fix hostap driver (#522269)
+ApplyPatch hostap-revert-toxic-part-of-conversion.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1975,6 +1981,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-62
+- Fix breakage in hostap driver (#522269)
+
 * Thu Sep 24 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-61
 - Backport the cpuidle-faster-io fix from Fedora 12 to fix I/O
   performance problems when reading/writing multiple disks.