diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-07 01:22:54 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-07 01:26:13 +0300 |
| commit | cfa6cb2048beb35ae7f1d2fa19160aab240557d1 (patch) | |
| tree | 9f3215138783d7a6cfd341e51495c1c2a725cfb4 /net/mac80211/offchannel.c | |
| parent | 8271195e38d01f3551bb10b1c7de856cd8507882 (diff) | |
| parent | 8a5b33f55452c226aa0e47d737e541985ff10e16 (diff) | |
| download | linux-cfa6cb2048beb35ae7f1d2fa19160aab240557d1.tar.xz | |
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/mac80211/offchannel.c')
| -rw-r--r-- | net/mac80211/offchannel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index a7bbfc40a648..1facfeb1f79b 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 */ |