]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: iwlwifi: fix iwl_mvm_get_valid_rx_ant()
authorDaniel Gabay <daniel.gabay@intel.com>
Tue, 18 Jun 2024 17:03:03 +0000 (20:03 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Aug 2024 06:59:41 +0000 (08:59 +0200)
[ Upstream commit 0091eda01412805e0d2c8025638ac0992102a7fc ]

Fix incorrect use of _tx_ valid ant data in the function.

Fixes: 4ea1ed1d14d8 ("wifi: iwlwifi: mvm: support set_antenna()")
Signed-off-by: Daniel Gabay <daniel.gabay@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20240618200104.b7c6a320c7dc.I3092eb5275056f2162b9694e583c310c38568b2a@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

index 6837d8afb9877f6552ca7ba5d3e27555dba3314a..ded094b6b63df2e1a6f3526742bd179822ac0cdb 100644 (file)
@@ -1863,10 +1863,10 @@ static inline u8 iwl_mvm_get_valid_tx_ant(struct iwl_mvm *mvm)
 
 static inline u8 iwl_mvm_get_valid_rx_ant(struct iwl_mvm *mvm)
 {
-       u8 rx_ant = mvm->fw->valid_tx_ant;
+       u8 rx_ant = mvm->fw->valid_rx_ant;
 
        if (mvm->nvm_data && mvm->nvm_data->valid_rx_ant)
-               rx_ant &= mvm->nvm_data->valid_tx_ant;
+               rx_ant &= mvm->nvm_data->valid_rx_ant;
 
        if (mvm->set_rx_ant)
                rx_ant &= mvm->set_rx_ant;