wifi: iwlwifi: mvm: set siso/mimo chains to 1 in FW SMPS request

The firmware changed their mind, don't set the chains to zero,
instead set them to 1 as we normally would for connections to
APs that don't use MIMO.

Fixes: 2a7ce54ccc23 ("iwlwifi: mvm: honour firmware SMPS requests")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231219215605.7f031f1a127f.Idc816e0f604b07d22a9d5352bc23c445512fad14@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
index 4e1fccff3987c11039e3e99ae13739d9506cc4e4..334d1f59f6e4679fa36f72717d6ce45d29b88e28 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
@@ -99,17 +99,6 @@ static void iwl_mvm_phy_ctxt_set_rxchain(struct iwl_mvm *mvm,
                active_cnt = 2;
        }
 
-       /*
-        * If the firmware requested it, then we know that it supports
-        * getting zero for the values to indicate "use one, but pick
-        * which one yourself", which means it can dynamically pick one
-        * that e.g. has better RSSI.
-        */
-       if (mvm->fw_static_smps_request && active_cnt == 1 && idle_cnt == 1) {
-               idle_cnt = 0;
-               active_cnt = 0;
-       }
-
        *rxchain_info = cpu_to_le32(iwl_mvm_get_valid_rx_ant(mvm) <<
                                        PHY_RX_CHAIN_VALID_POS);
        *rxchain_info |= cpu_to_le32(idle_cnt << PHY_RX_CHAIN_CNT_POS);