diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-06 23:22:54 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-06 23:26:13 +0100 |
| commit | cfa6cb2048beb35ae7f1d2fa19160aab240557d1 (patch) | |
| tree | 9f3215138783d7a6cfd341e51495c1c2a725cfb4 /net/mac80211/iface.c | |
| parent | wireless: fix build breakage when CONFIG_CFG80211_REG_DEBUG not set (diff) | |
| parent | Revert "mac80211: replace netif_tx_{start,stop,wake}_all_queues" (diff) | |
| download | linux-cfa6cb2048beb35ae7f1d2fa19160aab240557d1.tar.xz linux-cfa6cb2048beb35ae7f1d2fa19160aab240557d1.zip | |
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/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index c20ddddc3f2b..264a6c975f8b 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. |