diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-08-27 07:36:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-27 13:27:08 -0400 |
| commit | 2337db8db845ece2d4ab7673a343e285f1bfda85 (patch) | |
| tree | ec1a3c806b8638c08caf8acef1b9d411e1e612fd /net/mac80211 | |
| parent | a621fa4d6a7fdf9d34938d2e129a72624833eeeb (diff) | |
mac80211: use subqueue helpers
There are subqueue helpers so that we don't
need to get the TX queue and then wake/stop
it, use those helpers.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/tx.c | 3 | ||||
| -rw-r--r-- | net/mac80211/util.c | 4 |
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 | ||