leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Browse Source 
Conflicts:
	net/mac80211/scan.c
	net/mac80211/wme.c
This commit is contained in:
John W. Linville 2010-01-06 17:22:54 -05:00
commit cfa6cb2048
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/iface.c
View File

@ -329,7 +329,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_start_queue(dev); netif_tx_start_all_queues(dev);
return 0; return 0;
err_del_interface: err_del_interface:
@ -357,7 +357,7 @@ static int ieee80211_stop(struct net_device *dev)
/* /*
* Stop TX on this interface first. * Stop TX on this interface first.
*/ */
netif_stop_queue(dev); netif_tx_stop_all_queues(dev);
/* /*
* Purge work for this interface. * Purge work for this interface.

4
net/mac80211/mlme.c
View File

@ -723,7 +723,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
ieee80211_recalc_smps(local, sdata); ieee80211_recalc_smps(local, sdata);
mutex_unlock(&local->iflist_mtx); mutex_unlock(&local->iflist_mtx);
netif_start_queue(sdata->dev); netif_tx_start_all_queues(sdata->dev);
netif_carrier_on(sdata->dev); netif_carrier_on(sdata->dev);
} }
@ -759,7 +759,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_stop_queue(sdata->dev); netif_tx_stop_all_queues(sdata->dev);
netif_carrier_off(sdata->dev); netif_carrier_off(sdata->dev);
rcu_read_lock(); rcu_read_lock();

6
net/mac80211/offchannel.c
View File

@ -113,7 +113,7 @@ void ieee80211_offchannel_stop_beaconing(struct ieee80211_local *local)
*/ */
if (sdata->vif.type != NL80211_IFTYPE_STATION && if (sdata->vif.type != NL80211_IFTYPE_STATION &&
sdata->vif.type != NL80211_IFTYPE_MONITOR) sdata->vif.type != NL80211_IFTYPE_MONITOR)
netif_stop_queue(sdata->dev); netif_tx_stop_all_queues(sdata->dev);
} }
mutex_unlock(&local->iflist_mtx); mutex_unlock(&local->iflist_mtx);
} }
@ -131,7 +131,7 @@ void ieee80211_offchannel_stop_station(struct ieee80211_local *local)
continue; continue;
if (sdata->vif.type == NL80211_IFTYPE_STATION) { if (sdata->vif.type == NL80211_IFTYPE_STATION) {
netif_stop_queue(sdata->dev); netif_tx_stop_all_queues(sdata->dev);
if (sdata->u.mgd.associated) if (sdata->u.mgd.associated)
ieee80211_offchannel_ps_enable(sdata); ieee80211_offchannel_ps_enable(sdata);
} }
@ -153,7 +153,7 @@ void ieee80211_offchannel_return(struct ieee80211_local *local,
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_offchannel_ps_disable(sdata); ieee80211_offchannel_ps_disable(sdata);
netif_wake_queue(sdata->dev); netif_tx_wake_all_queues(sdata->dev);
} }
/* re-enable beaconing */ /* re-enable beaconing */