diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-04-08 13:34:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-04-08 13:34:54 -0400 |
commit | 0f2df9eac70423838a1f8d410fd3899ddd88317b (patch) | |
tree | 0617f723320d83eca5cef9c964c001014e74213f /net/mac80211/tx.c | |
parent | 8c11e4ab09ffb975a89802dde0e9aa52a53b8aa5 (diff) | |
parent | 1144601118507f8b3b676a9a392584d216d3f2cc (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-tx.c
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f7209d691c35..2cb77267f733 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -1992,6 +1992,7 @@ static bool ieee80211_tx_pending_skb(struct ieee80211_local *local, | |||
1992 | void ieee80211_tx_pending(unsigned long data) | 1992 | void ieee80211_tx_pending(unsigned long data) |
1993 | { | 1993 | { |
1994 | struct ieee80211_local *local = (struct ieee80211_local *)data; | 1994 | struct ieee80211_local *local = (struct ieee80211_local *)data; |
1995 | struct ieee80211_sub_if_data *sdata; | ||
1995 | unsigned long flags; | 1996 | unsigned long flags; |
1996 | int i; | 1997 | int i; |
1997 | bool txok; | 1998 | bool txok; |
@@ -2028,6 +2029,11 @@ void ieee80211_tx_pending(unsigned long data) | |||
2028 | if (!txok) | 2029 | if (!txok) |
2029 | break; | 2030 | break; |
2030 | } | 2031 | } |
2032 | |||
2033 | if (skb_queue_empty(&local->pending[i])) | ||
2034 | list_for_each_entry_rcu(sdata, &local->interfaces, list) | ||
2035 | netif_tx_wake_queue( | ||
2036 | netdev_get_tx_queue(sdata->dev, i)); | ||
2031 | } | 2037 | } |
2032 | spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); | 2038 | spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); |
2033 | 2039 | ||