aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-13 06:11:00 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-03-18 15:15:03 -0400
commit39ecc01d1bbe3de2cf5f01a81e176ea5160d3b95 (patch)
tree1a75bf065c61f0870ff4d63eac6130998834748c /net/mac80211/scan.c
parenta0ca796c460259bc079631d2d148ffff1d1fc736 (diff)
mac80211: pass queue bitmap to flush operation
There are a number of situations in which mac80211 only really needs to flush queues for one virtual interface, and in fact during this frames might be transmitted on other virtual interfaces. Calculate and pass a queue bitmap to the driver so it knows which queues to flush. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 5dc17c623f72..cb34cbbaa20c 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -332,7 +332,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
332 ieee80211_offchannel_stop_vifs(local); 332 ieee80211_offchannel_stop_vifs(local);
333 333
334 /* ensure nullfunc is transmitted before leaving operating channel */ 334 /* ensure nullfunc is transmitted before leaving operating channel */
335 drv_flush(local, false); 335 ieee80211_flush_queues(local, NULL);
336 336
337 ieee80211_configure_filter(local); 337 ieee80211_configure_filter(local);
338 338
@@ -668,7 +668,7 @@ static void ieee80211_scan_state_resume(struct ieee80211_local *local,
668 ieee80211_offchannel_stop_vifs(local); 668 ieee80211_offchannel_stop_vifs(local);
669 669
670 if (local->ops->flush) { 670 if (local->ops->flush) {
671 drv_flush(local, false); 671 ieee80211_flush_queues(local, NULL);
672 *next_delay = 0; 672 *next_delay = 0;
673 } else 673 } else
674 *next_delay = HZ / 10; 674 *next_delay = HZ / 10;