aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/tx.c3
-rw-r--r--net/mac80211/util.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 92764bb8795c..ccf373788ce9 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -2092,8 +2092,7 @@ void ieee80211_tx_pending(unsigned long data)
2092 2092
2093 if (skb_queue_empty(&local->pending[i])) 2093 if (skb_queue_empty(&local->pending[i]))
2094 list_for_each_entry_rcu(sdata, &local->interfaces, list) 2094 list_for_each_entry_rcu(sdata, &local->interfaces, list)
2095 netif_tx_wake_queue( 2095 netif_wake_subqueue(sdata->dev, i);
2096 netdev_get_tx_queue(sdata->dev, i));
2097 } 2096 }
2098 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); 2097 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
2099 2098
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index cd2b485fed4f..ef686d3b04e3 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -284,7 +284,7 @@ static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue,
284 if (skb_queue_empty(&local->pending[queue])) { 284 if (skb_queue_empty(&local->pending[queue])) {
285 rcu_read_lock(); 285 rcu_read_lock();
286 list_for_each_entry_rcu(sdata, &local->interfaces, list) 286 list_for_each_entry_rcu(sdata, &local->interfaces, list)
287 netif_tx_wake_queue(netdev_get_tx_queue(sdata->dev, queue)); 287 netif_wake_subqueue(sdata->dev, queue);
288 rcu_read_unlock(); 288 rcu_read_unlock();
289 } else 289 } else
290 tasklet_schedule(&local->tx_pending_tasklet); 290 tasklet_schedule(&local->tx_pending_tasklet);
@@ -323,7 +323,7 @@ static void __ieee80211_stop_queue(struct ieee80211_hw *hw, int queue,
323 323
324 rcu_read_lock(); 324 rcu_read_lock();
325 list_for_each_entry_rcu(sdata, &local->interfaces, list) 325 list_for_each_entry_rcu(sdata, &local->interfaces, list)
326 netif_tx_stop_queue(netdev_get_tx_queue(sdata->dev, queue)); 326 netif_stop_subqueue(sdata->dev, queue);
327 rcu_read_unlock(); 327 rcu_read_unlock();
328} 328}
329 329