Merge tag 'mac80211-next-for-net-next-2020-02-14' of git://git.kernel.org/pub/scm...

[linux-2.6-microblaze.git] / net / mac80211 / mlme.c

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 320a2b3..9ab0842 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -8,7 +8,7 @@
  * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
  * Copyright 2013-2014  Intel Mobile Communications GmbH
  * Copyright (C) 2015 - 2017 Intel Deutschland GmbH
- * Copyright (C) 2018 - 2019 Intel Corporation
+ * Copyright (C) 2018 - 2020 Intel Corporation
  */
 
 #include <linux/delay.h>
@@ -1338,7 +1338,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 =  beacon ? csa_ie.mode : 0;
+               ch_switch.block_tx = csa_ie.mode;
                ch_switch.chandef = csa_ie.chandef;
                ch_switch.count = csa_ie.count;
                ch_switch.delay = csa_ie.max_switch_time;
@@ -1431,7 +1431,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 = ch_switch.block_tx;
+       sdata->csa_block_tx = csa_ie.mode;
        ifmgd->csa_ignored_same_chan = false;
 
        if (sdata->csa_block_tx)
@@ -1465,7 +1465,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 = ch_switch.block_tx;
+       sdata->csa_block_tx = csa_ie.mode;
 
        ieee80211_queue_work(&local->hw, &ifmgd->csa_connection_drop_work);
        mutex_unlock(&local->chanctx_mtx);