diff options
| author | Luciano Coelho <luciano.coelho@intel.com> | 2014-06-13 13:30:07 (GMT) |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-06-23 12:22:29 (GMT) |
| commit | a46992b441f097a971cca39f49d07a0d16a1c0d8 (patch) | |
| tree | d80aacded124a3add8691ada27deb47ce6722ae0 /net/mac80211/iface.c | |
| parent | 26da23b6950cd1aaae86caa541eb4befc9e96e1d (diff) | |
| download | linux-a46992b441f097a971cca39f49d07a0d16a1c0d8.tar.xz | |
mac80211: stop only the queues assigned to the vif during channel switch
Instead of stopping all the hardware queues during channel switch,
which is especially bad when we have large CSA counts, stop only the
queues that are assigned to the vif that is performing the channel
switch.
Additionally, check for (sdata->csa_block_tx) instead of calling
ieee80211_csa_needs_block_tx(), which can now be removed.
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 1971d24..2a12b8a 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -841,11 +841,11 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, sdata_lock(sdata); mutex_lock(&local->mtx); sdata->vif.csa_active = false; - if (!ieee80211_csa_needs_block_tx(local)) - ieee80211_wake_queues_by_reason(&local->hw, - IEEE80211_MAX_QUEUE_MAP, - IEEE80211_QUEUE_STOP_REASON_CSA, - false); + if (sdata->csa_block_tx) { + ieee80211_wake_vif_queues(local, sdata, + IEEE80211_QUEUE_STOP_REASON_CSA); + sdata->csa_block_tx = false; + } mutex_unlock(&local->mtx); sdata_unlock(sdata); |