--- net/mac80211/util.c

+++ net/mac80211/util.c

@@ -280,13 +280,13 @@ static void __ieee80211_wake_queue(struc

/* someone still has this queue stopped */

return;

- if (!skb_queue_empty(&local->pending[queue]))

+ if (skb_queue_empty(&local->pending[queue])) {

+ 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();

+ } else

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,

@@ -1137,6 +1137,14 @@ int ieee80211_reconfig(struct ieee80211_

}

}

+ rcu_read_lock();

+ if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {

+ list_for_each_entry_rcu(sta, &local->sta_list, list) {

+ ieee80211_sta_tear_down_BA_sessions(sta);

+ }

+ }

+ rcu_read_unlock();

+

/* add back keys */

list_for_each_entry(sdata, &local->interfaces, list)

if (netif_running(sdata->dev))