| From d96e41bc568469f003d5407ca295e2342ad1bae1 Mon Sep 17 00:00:00 2001 |
| From: Sara Sharon <sara.sharon@intel.com> |
| Date: Fri, 31 Jan 2020 13:12:51 +0200 |
| Subject: [PATCH] mac80211: fix quiet mode activation in action frames |
| |
| commit 2bf973ff9b9aeceb8acda629ae65341820d4b35b upstream. |
| |
| Previously I intended to ignore quiet mode in probe response, however |
| I ended up ignoring it instead for action frames. As a matter of fact, |
| this path isn't invoked for probe responses to start with. Just revert |
| this patch. |
| |
| Signed-off-by: Sara Sharon <sara.sharon@intel.com> |
| Fixes: 7976b1e9e3bf ("mac80211: ignore quiet mode in probe") |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Link: https://lore.kernel.org/r/20200131111300.891737-15-luca@coelho.fi |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c |
| index e75f1b4b3ce3..932a5bc73967 100644 |
| --- 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> |
| @@ -1310,7 +1310,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; |
| @@ -1403,7 +1403,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) |
| @@ -1437,7 +1437,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); |
| -- |
| 2.7.4 |
| |