diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-01-06 15:39:39 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-06 16:16:39 -0500 |
commit | 8a5b33f55452c226aa0e47d737e541985ff10e16 (patch) | |
tree | f59eef010705957107ba45bca3f56a861b0e155e /net/mac80211/iface.c | |
parent | debde9ea24d5512400456b1b64df361e422f078d (diff) |
Revert "mac80211: replace netif_tx_{start,stop,wake}_all_queues"
This reverts commit 53623f1a09c7a7d23b74f0f7d93dba0ebde1006b.
This was inadvertantly missed in "mac80211: fix skb buffering issue",
and is required with that patch to restore proper queue operation.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
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 c261cdb359eb..ff762ed34f1e 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -316,7 +316,7 @@ static int ieee80211_open(struct net_device *dev) | |||
316 | if (sdata->vif.type == NL80211_IFTYPE_STATION) | 316 | if (sdata->vif.type == NL80211_IFTYPE_STATION) |
317 | ieee80211_queue_work(&local->hw, &sdata->u.mgd.work); | 317 | ieee80211_queue_work(&local->hw, &sdata->u.mgd.work); |
318 | 318 | ||
319 | netif_start_queue(dev); | 319 | netif_tx_start_all_queues(dev); |
320 | 320 | ||
321 | return 0; | 321 | return 0; |
322 | err_del_interface: | 322 | err_del_interface: |
@@ -345,7 +345,7 @@ static int ieee80211_stop(struct net_device *dev) | |||
345 | /* | 345 | /* |
346 | * Stop TX on this interface first. | 346 | * Stop TX on this interface first. |
347 | */ | 347 | */ |
348 | netif_stop_queue(dev); | 348 | netif_tx_stop_all_queues(dev); |
349 | 349 | ||
350 | /* | 350 | /* |
351 | * Now delete all active aggregation sessions. | 351 | * Now delete all active aggregation sessions. |