rpms/kernel/F-10 mac80211-don-t-drop-nullfunc-frames-during-software.patch, NONE, 1.1 kernel.spec, 1.1369, 1.1370

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	mac80211-don-t-drop-nullfunc-frames-during-software.patch 
Log Message:
Copy fix from F-11:
   mac80211-don-t-drop-nullfunc-frames-during-software.patch:
    upstream a9a6ffffd05f97e6acbdeafc595e269855829751.

mac80211-don-t-drop-nullfunc-frames-during-software.patch:

--- NEW FILE mac80211-don-t-drop-nullfunc-frames-during-software.patch ---
>From 91afa7a151a0fdce2b7d27d39ecbfc40e1b3e8ad Mon Sep 17 00:00:00 2001
From: Kalle Valo <kalle.valo at nokia.com>
Date: Wed, 18 Mar 2009 14:06:44 +0200
Subject: [PATCH] mac80211: don't drop nullfunc frames during software scan

ieee80211_tx_h_check_assoc() was dropping everything else than probe
requests during software scan. So the nullfunc frame with the power save
bit was dropped and AP never received it. This meant that AP never
buffered any frames for the station during software scan.

Fix this by allowing to transmit both probe request and nullfunc frames
during software scan. Tested with stlc45xx.

Signed-off-by: Kalle Valo <kalle.valo at nokia.com>
Acked-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
---
 net/mac80211/scan.c |   13 +++++++++++++
 net/mac80211/tx.c   |   14 +++++++++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index f5c7c33..1389f29 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -631,6 +631,19 @@ int ieee80211_start_scan(struct ieee80211_sub_if_data *scan_sdata,
 		return 0;
 	}
 
+	/*
+	 * Hardware/driver doesn't support hw_scan, so use software
+	 * scanning instead. First send a nullfunc frame with power save
+	 * bit on so that AP will buffer the frames for us while we are not
+	 * listening, then send probe requests to each channel and wait for
+	 * the responses. After all channels are scanned, tune back to the
+	 * original channel and send a nullfunc frame with power save bit
+	 * off to trigger the AP to send us all the buffered frames.
+	 *
+	 * Note that while local->sw_scanning is true everything else but
+	 * nullfunc frames and probe requests will be dropped in
+	 * ieee80211_tx_h_check_assoc().
+	 */
 	local->sw_scanning = true;
 
 	rcu_read_lock();
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 37e3d5e..c45d275 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -192,7 +192,19 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
 		return TX_CONTINUE;
 
 	if (unlikely(tx->local->sw_scanning) &&
-	    !ieee80211_is_probe_req(hdr->frame_control))
+	    !ieee80211_is_probe_req(hdr->frame_control) &&
+	    !ieee80211_is_nullfunc(hdr->frame_control))
+		/*
+		 * When software scanning only nullfunc frames (to notify
+		 * the sleep state to the AP) and probe requests (for the
+		 * active scan) are allowed, all other frames should not be
+		 * sent and we should not get here, but if we do
+		 * nonetheless, drop them to avoid sending them
+		 * off-channel. See the link below and
+		 * ieee80211_start_scan() for more.
+		 *
+		 * http://article.gmane.org/gmane.linux.kernel.wireless.general/30089
+		 */
 		return TX_DROP;
 
 	if (tx->sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
-- 
1.6.2.2



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1369
retrieving revision 1.1370
diff -u -p -r1.1369 -r1.1370
--- kernel.spec	22 May 2009 17:26:43 -0000	1.1369
+++ kernel.spec	22 May 2009 20:41:10 -0000	1.1370
@@ -656,6 +656,7 @@ Patch683: linux-2.6-iwl3945-report-kills
 Patch684: linux-2.6-iwlagn-fix-hw-rfkill-while-the-interface-is-down.patch
 Patch685: linux-2.6-iwl3945-use-cancel_delayed_work_sync-to-cancel-rfkill_poll.patch
 Patch686: linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
+Patch687: mac80211-don-t-drop-nullfunc-frames-during-software.patch
 
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
@@ -1309,6 +1310,8 @@ ApplyPatch linux-2.6-iwl3945-use-cancel_
 # back-port mac80211: fix beacon loss detection after scan
 ApplyPatch linux-2.6-mac80211-fix-beacon-loss-detection-after-scan.patch
 
+ApplyPatch mac80211-don-t-drop-nullfunc-frames-during-software.patch
+
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
@@ -1943,6 +1946,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri May 22 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.29.4-70
+- Copy fix from F-11:
+   mac80211-don-t-drop-nullfunc-frames-during-software.patch:
+    upstream a9a6ffffd05f97e6acbdeafc595e269855829751.
+
 * Fri May 22 2009 John W. Linville <linville at redhat.com> - 2.6.29.4-69
 - back-port "iwl3945: use cancel_delayed_work_sync to cancel rfkill_poll"