Please try this.
johannes
---
net/mac80211/tx.c | 6 ++++++
net/mac80211/util.c | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
--- wireless-testing.orig/net/mac80211/tx.c 2010-03-18 11:17:43.000000000 -0700
+++ wireless-testing/net/mac80211/tx.c 2010-03-18 11:19:16.000000000 -0700
@@ -1991,6 +1991,7 @@ static bool ieee80211_tx_pending_skb(str
void ieee80211_tx_pending(unsigned long data)
{
struct ieee80211_local *local = (struct ieee80211_local *)data;
+ struct ieee80211_sub_if_data *sdata;
unsigned long flags;
int i;
bool txok;
@@ -2029,6 +2030,11 @@ void ieee80211_tx_pending(unsigned long
if (!txok)
break;
}
+
+ if (skb_queue_empty(&local->pending[i]))
+ list_for_each_entry_rcu(sdata, &local->interfaces, list)
+ netif_tx_wake_queue(
+ netdev_get_tx_queue(sdata->dev, i));
}
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
--- wireless-testing.orig/net/mac80211/util.c 2010-03-18 11:17:08.000000000 -0700
+++ wireless-testing/net/mac80211/util.c 2010-03-18 11:19:28.000000000 -0700
@@ -268,7 +268,6 @@ static void __ieee80211_wake_queue(struc
enum queue_stop_reason reason)
{
struct ieee80211_local *local = hw_to_local(hw);
- struct ieee80211_sub_if_data *sdata;
if (WARN_ON(queue >= hw->queues))
return;
@@ -281,11 +280,6 @@ static void __ieee80211_wake_queue(struc
if (!skb_queue_empty(&local->pending[queue]))
tasklet_schedule(&local->tx_pending_tasklet);
-
- rcu_read_lock();
- list_for_each_entry_rcu(sdata, &local->interfaces, list)
- netif_tx_wake_queue(netdev_get_tx_queue(sdata->dev, queue));
- rcu_read_unlock();
}
void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
