mac80211: ignore quiet mode in probe

Some buggy APs keep the CSA IE in probes after the channel
switch was completed and can silence us for no good reason.
Apply quiet mode only from beacons. If there is real channel
switch going on, we will see the beacon anyway.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index e20456c2d6fb..2dbcf5d5512e 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1316,7 +1316,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
         if (!res) {
                 ch_switch.timestamp = timestamp;
                 ch_switch.device_timestamp = device_timestamp;
-                ch_switch.block_tx = csa_ie.mode;
+                ch_switch.block_tx =  beacon ? csa_ie.mode : 0;
                 ch_switch.chandef = csa_ie.chandef;
                 ch_switch.count = csa_ie.count;
                 ch_switch.delay = csa_ie.max_switch_time;
@@ -1409,7 +1409,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
 
         sdata->vif.csa_active = true;
         sdata->csa_chandef = csa_ie.chandef;
-        sdata->csa_block_tx = csa_ie.mode;
+        sdata->csa_block_tx = ch_switch.block_tx;
         ifmgd->csa_ignored_same_chan = false;
 
         if (sdata->csa_block_tx)
@@ -1443,7 +1443,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
          * reset when the disconnection worker runs.
          */
         sdata->vif.csa_active = true;
-        sdata->csa_block_tx = csa_ie.mode;
+        sdata->csa_block_tx = ch_switch.block_tx;
 
         ieee80211_queue_work(&local->hw, &ifmgd->csa_connection_drop_work);
         mutex_unlock(&local->chanctx_mtx);