adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

mac80211: replace netif_tx_{start,stop,wake}_all_queues

Browse source 
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>
This commit is contained in:
John W. Linville 2009-10-15 15:10:16 -04:00
parent e5e2647fd6
commit 53623f1a09
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/mac80211/iface.c
View file

@ -314,7 +314,7 @@ static int ieee80211_open(struct net_device *dev)
if (sdata->vif.type == NL80211_IFTYPE_STATION) if (sdata->vif.type == NL80211_IFTYPE_STATION)
ieee80211_queue_work(&local->hw, &sdata->u.mgd.work); ieee80211_queue_work(&local->hw, &sdata->u.mgd.work);
netif_tx_start_all_queues(dev); netif_start_queue(dev);
return 0; return 0;
err_del_interface: err_del_interface:
@ -343,7 +343,7 @@ static int ieee80211_stop(struct net_device *dev)
/* /*
* Stop TX on this interface first. * Stop TX on this interface first.
*/ */
netif_tx_stop_all_queues(dev); netif_stop_queue(dev);
/* /*
* Now delete all active aggregation sessions. * Now delete all active aggregation sessions.

4
net/mac80211/mlme.c
View file

@ -929,7 +929,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
ieee80211_recalc_ps(local, -1); ieee80211_recalc_ps(local, -1);
mutex_unlock(&local->iflist_mtx); mutex_unlock(&local->iflist_mtx);
netif_tx_start_all_queues(sdata->dev); netif_start_queue(sdata->dev);
netif_carrier_on(sdata->dev); netif_carrier_on(sdata->dev);
} }
@ -1061,7 +1061,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
* time -- we don't want the scan code to enable queues. * time -- we don't want the scan code to enable queues.
*/ */
netif_tx_stop_all_queues(sdata->dev); netif_stop_queue(sdata->dev);
netif_carrier_off(sdata->dev); netif_carrier_off(sdata->dev);
rcu_read_lock(); rcu_read_lock();

10
net/mac80211/scan.c
View file

@ -306,10 +306,10 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted)
if (sdata->vif.type == NL80211_IFTYPE_STATION) { if (sdata->vif.type == NL80211_IFTYPE_STATION) {
if (sdata->u.mgd.associated) { if (sdata->u.mgd.associated) {
ieee80211_scan_ps_disable(sdata); ieee80211_scan_ps_disable(sdata);
netif_tx_wake_all_queues(sdata->dev); netif_wake_queue(sdata->dev);
} }
} else } else
netif_tx_wake_all_queues(sdata->dev); netif_wake_queue(sdata->dev);
/* re-enable beaconing */ /* re-enable beaconing */
if (sdata->vif.type == NL80211_IFTYPE_AP || if (sdata->vif.type == NL80211_IFTYPE_AP ||
@ -364,7 +364,7 @@ static int ieee80211_start_sw_scan(struct ieee80211_local *local)
* are handled in the scan state machine * are handled in the scan state machine
*/ */
if (sdata->vif.type != NL80211_IFTYPE_STATION) if (sdata->vif.type != NL80211_IFTYPE_STATION)
netif_tx_stop_all_queues(sdata->dev); netif_stop_queue(sdata->dev);
} }
mutex_unlock(&local->iflist_mtx); mutex_unlock(&local->iflist_mtx);
@ -523,7 +523,7 @@ static void ieee80211_scan_state_leave_oper_channel(struct ieee80211_local *loca
continue; continue;
if (sdata->vif.type == NL80211_IFTYPE_STATION) { if (sdata->vif.type == NL80211_IFTYPE_STATION) {
netif_tx_stop_all_queues(sdata->dev); netif_stop_queue(sdata->dev);
if (sdata->u.mgd.associated) if (sdata->u.mgd.associated)
ieee80211_scan_ps_enable(sdata); ieee80211_scan_ps_enable(sdata);
} }
@ -558,7 +558,7 @@ static void ieee80211_scan_state_enter_oper_channel(struct ieee80211_local *loca
if (sdata->vif.type == NL80211_IFTYPE_STATION) { if (sdata->vif.type == NL80211_IFTYPE_STATION) {
if (sdata->u.mgd.associated) if (sdata->u.mgd.associated)
ieee80211_scan_ps_disable(sdata); ieee80211_scan_ps_disable(sdata);
netif_tx_wake_all_queues(sdata->dev); netif_wake_queue(sdata->dev);
} }
} }
mutex_unlock(&local->iflist_mtx); mutex_unlock(&local->iflist_mtx);