Commit a2b70e83 authored Dec 05, 2013 by Eliad Peller Committed by Johannes Berg Dec 05, 2013

mac80211: start_next_roc only if scan was actually running



On scan completion we try start any pending roc.

However, if scan was just pending (and not actually started)
there is no point in trying to start the roc, as it might
have started already.

This solves the following warning:
WARNING: CPU: 0 PID: 3552 at net/mac80211/offchannel.c:269 ieee80211_start_next_roc+0x164/0x204 [mac80211]()
[<c001cd38>] (unwind_backtrace+0x0/0xf0)
[<c00181d0>] (show_stack+0x10/0x14)
[<c05c0d8c>] (dump_stack+0x78/0x94)
[<c0047c08>] (warn_slowpath_common+0x68/0x8c)
[<c0047c48>] (warn_slowpath_null+0x1c/0x24)
[<bf4d6660>] (ieee80211_start_next_roc+0x164/0x204 [mac80211])
[<bf4d5a74>] (ieee80211_scan_cancel+0xe8/0x190 [mac80211])
[<bf4df970>] (ieee80211_do_stop+0x63c/0x79c [mac80211])
[<bf4dfae0>] (ieee80211_stop+0x10/0x18 [mac80211])
[<c0504d84>] (__dev_close_many+0x84/0xcc)
[<c0504df4>] (__dev_close+0x28/0x3c)
[<c0509708>] (__dev_change_flags+0x78/0x144)
[<c0509854>] (dev_change_flags+0x10/0x48)
[<c055fe3c>] (devinet_ioctl+0x614/0x6d0)
[<c04f22a0>] (sock_ioctl+0x5c/0x2a4)
[<c0124eb4>] (do_vfs_ioctl+0x7c/0x5d8)
[<c012547c>] (SyS_ioctl+0x6c/0x7c)

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 8bd2a248

net/mac80211/scan.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -275,6 +275,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
		{
		struct ieee80211_local *local = hw_to_local(hw);
		bool hw_scan = local->ops->hw_scan;
		bool was_scanning = local->scanning;

		lockdep_assert_held(&local->mtx);

		@@ -327,6 +328,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
		ieee80211_mlme_notify_scan_completed(local);
		ieee80211_ibss_notify_scan_completed(local);
		ieee80211_mesh_notify_scan_completed(local);
		if (was_scanning)
		ieee80211_start_next_roc(local);
		}

Admin message