aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/scan.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2009-10-15 15:10:16 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-10-27 16:48:18 -0400
commit53623f1a09c7a7d23b74f0f7d93dba0ebde1006b (patch)
treeb057e1ce55e81191c0eb002dc146e9c788eb4a00 /net/mac80211/scan.c
parente5e2647fd6ceef2cdc479954b84517535eb7febd (diff)
mac80211: replace netif_tx_{start,stop,wake}_all_queues
Replace netif_tx_{start,stop,wake}_all_queues with the single-queue equivalents (i.e. netif_{start,stop,wake}_queue). Since we are down to a single queue, these should peform slightly better. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/scan.c')
-rw-r--r--net/mac80211/scan.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 71e10cabf811..7a350d2690a0 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -306,10 +306,10 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
306 if (sdata->vif.type == NL80211_IFTYPE_STATION) { 306 if (sdata->vif.type == NL80211_IFTYPE_STATION) {
307 if (sdata->u.mgd.associated) { 307 if (sdata->u.mgd.associated) {
308 ieee80211_scan_ps_disable(sdata); 308 ieee80211_scan_ps_disable(sdata);
309 netif_tx_wake_all_queues(sdata->dev); 309 netif_wake_queue(sdata->dev);
310 } 310 }
311 } else 311 } else
312 netif_tx_wake_all_queues(sdata->dev); 312 netif_wake_queue(sdata->dev);
313 313
314 /* re-enable beaconing */ 314 /* re-enable beaconing */
315 if (sdata->vif.type == NL80211_IFTYPE_AP || 315 if (sdata->vif.type == NL80211_IFTYPE_AP ||
@@ -364,7 +364,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
364 * are handled in the scan state machine 364 * are handled in the scan state machine
365 */ 365 */
366 if (sdata->vif.type != NL80211_IFTYPE_STATION) 366 if (sdata->vif.type != NL80211_IFTYPE_STATION)
367 netif_tx_stop_all_queues(sdata->dev); 367 netif_stop_queue(sdata->dev);
368 } 368 }
369 mutex_unlock(&local->iflist_mtx); 369 mutex_unlock(&local->iflist_mtx);
370 370
@@ -523,7 +523,7 @@ static void ieee80211_scan_state_leave_oper_channel(struct ieee80211_local *loca
523 continue; 523 continue;
524 524
525 if (sdata->vif.type == NL80211_IFTYPE_STATION) { 525 if (sdata->vif.type == NL80211_IFTYPE_STATION) {
526 netif_tx_stop_all_queues(sdata->dev); 526 netif_stop_queue(sdata->dev);
527 if (sdata->u.mgd.associated) 527 if (sdata->u.mgd.associated)
528 ieee80211_scan_ps_enable(sdata); 528 ieee80211_scan_ps_enable(sdata);
529 } 529 }
@@ -558,7 +558,7 @@ static void ieee80211_scan_state_enter_oper_channel(struct ieee80211_local *loca
558 if (sdata->vif.type == NL80211_IFTYPE_STATION) { 558 if (sdata->vif.type == NL80211_IFTYPE_STATION) {
559 if (sdata->u.mgd.associated) 559 if (sdata->u.mgd.associated)
560 ieee80211_scan_ps_disable(sdata); 560 ieee80211_scan_ps_disable(sdata);
561 netif_tx_wake_all_queues(sdata->dev); 561 netif_wake_queue(sdata->dev);
562 } 562 }
563 } 563 }
564 mutex_unlock(&local->iflist_mtx); 564 mutex_unlock(&local->iflist_mtx);