diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-06 17:22:54 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-06 17:26:13 -0500 |
| commit | cfa6cb2048beb35ae7f1d2fa19160aab240557d1 (patch) | |
| tree | 9f3215138783d7a6cfd341e51495c1c2a725cfb4 /net | |
| parent | 8271195e38d01f3551bb10b1c7de856cd8507882 (diff) | |
| parent | 8a5b33f55452c226aa0e47d737e541985ff10e16 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/scan.c
net/mac80211/wme.c
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/iface.c | 4 | ||||
| -rw-r--r-- | net/mac80211/mlme.c | 4 | ||||
| -rw-r--r-- | net/mac80211/offchannel.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index c20ddddc3f2..264a6c975f8 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -329,7 +329,7 @@ static int ieee80211_open(struct net_device *dev) if (sdata->vif.type == NL80211_IFTYPE_STATION) ieee80211_queue_work(&local->hw, &sdata->u.mgd.work); - netif_start_queue(dev); + netif_tx_start_all_queues(dev); return 0; err_del_interface: @@ -357,7 +357,7 @@ static int ieee80211_stop(struct net_device *dev) /* * Stop TX on this interface first. */ - netif_stop_queue(dev); + netif_tx_stop_all_queues(dev); /* * Purge work for this interface. diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 72920ee0788..97bcf2278bd 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -723,7 +723,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata, ieee80211_recalc_smps(local, sdata); mutex_unlock(&local->iflist_mtx); - netif_start_queue(sdata->dev); + netif_tx_start_all_queues(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. */ - netif_stop_queue(sdata->dev); + netif_tx_stop_all_queues(sdata->dev); netif_carrier_off(sdata->dev); rcu_read_lock(); diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index a7bbfc40a64..1facfeb1f79 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -113,7 +113,7 @@ void ieee80211_offchannel_stop_beaconing(struct ieee80211_local *local) */ if (sdata->vif.type != NL80211_IFTYPE_STATION && sdata->vif.type != NL80211_IFTYPE_MONITOR) - netif_stop_queue(sdata->dev); + netif_tx_stop_all_queues(sdata->dev); } mutex_unlock(&local->iflist_mtx); } @@ -131,7 +131,7 @@ void ieee80211_offchannel_stop_station(struct ieee80211_local *local) continue; if (sdata->vif.type == NL80211_IFTYPE_STATION) { - netif_stop_queue(sdata->dev); + netif_tx_stop_all_queues(sdata->dev); if (sdata->u.mgd.associated) 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->u.mgd.associated) ieee80211_offchannel_ps_disable(sdata); - netif_wake_queue(sdata->dev); + netif_tx_wake_all_queues(sdata->dev); } /* re-enable beaconing */ |