| From c1b8c66f917882a0cc8eeb4a9998af82b5113d29 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sun, 11 Apr 2021 12:46:30 +0300 |
| Subject: iwlwifi: rs-fw: don't support stbc for HE 160 |
| |
| From: Mordechay Goodstein <mordechay.goodstein@intel.com> |
| |
| [ Upstream commit a9174578262b86f15cb1882f35e53b1fae0649fd ] |
| |
| Our HE doesn't support it so never set HE 160 stbc |
| |
| Fixes: 3e467b8e4cf4 ("iwlwifi: rs-fw: enable STBC in he correctly") |
| Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com> |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Link: https://lore.kernel.org/r/iwlwifi.20210411124418.550fd1903eb7.I8ddbc2f87044a5ef78d916c9c59be797811a1b7f@changeid |
| Signed-off-by: Luca Coelho <luciano.coelho@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| .../net/wireless/intel/iwlwifi/mvm/rs-fw.c | 20 ++++++++----------- |
| 1 file changed, 8 insertions(+), 12 deletions(-) |
| |
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c |
| index 490a561c71db..cdfab7c0ca74 100644 |
| --- a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c |
| +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c |
| @@ -1,7 +1,7 @@ |
| // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause |
| /* |
| * Copyright (C) 2017 Intel Deutschland GmbH |
| - * Copyright (C) 2018-2020 Intel Corporation |
| + * Copyright (C) 2018-2021 Intel Corporation |
| */ |
| #include "rs.h" |
| #include "fw-api.h" |
| @@ -72,19 +72,15 @@ static u16 rs_fw_get_config_flags(struct iwl_mvm *mvm, |
| bool vht_ena = vht_cap->vht_supported; |
| u16 flags = 0; |
| |
| + /* get STBC flags */ |
| if (mvm->cfg->ht_params->stbc && |
| (num_of_ant(iwl_mvm_get_valid_tx_ant(mvm)) > 1)) { |
| - if (he_cap->has_he) { |
| - if (he_cap->he_cap_elem.phy_cap_info[2] & |
| - IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ) |
| - flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK; |
| - |
| - if (he_cap->he_cap_elem.phy_cap_info[7] & |
| - IEEE80211_HE_PHY_CAP7_STBC_RX_ABOVE_80MHZ) |
| - flags |= IWL_TLC_MNG_CFG_FLAGS_HE_STBC_160MHZ_MSK; |
| - } else if ((ht_cap->cap & IEEE80211_HT_CAP_RX_STBC) || |
| - (vht_ena && |
| - (vht_cap->cap & IEEE80211_VHT_CAP_RXSTBC_MASK))) |
| + if (he_cap->has_he && he_cap->he_cap_elem.phy_cap_info[2] & |
| + IEEE80211_HE_PHY_CAP2_STBC_RX_UNDER_80MHZ) |
| + flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK; |
| + else if (vht_cap->cap & IEEE80211_VHT_CAP_RXSTBC_MASK) |
| + flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK; |
| + else if (ht_cap->cap & IEEE80211_HT_CAP_RX_STBC) |
| flags |= IWL_TLC_MNG_CFG_FLAGS_STBC_MSK; |
| } |
| |
| -- |
| 2.30.2 |
| |