Commit 004272bc authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: when HW has rate offload don't look at control field 



Control field is set by mac80211 only if case rate is not offloaded to
hw.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210210135352.f845c4387eed.I30c4d26698bae1f5f8c396da80a545baa145e2ad@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 9cf671d6

drivers/net/wireless/intel/iwlwifi/mvm/tx.c

+13 −9
Original line number Diff line number Diff line
@@ -265,11 +265,13 @@ static u32 iwl_mvm_get_tx_rate(struct iwl_mvm *mvm, 
			       struct ieee80211_tx_info *info,

			       struct ieee80211_sta *sta, __le16 fc)

{

	int rate_idx;

	int rate_idx = -1;

	u8 rate_plcp;

	u32 rate_flags = 0;

	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);



	/* info->control is only relevant for non HW rate control */

	if (!ieee80211_hw_check(mvm->hw, HAS_RATE_CONTROL)) {

		/* HT rate doesn't make sense for a non data frame */

		WARN_ONCE(info->control.rates[0].flags & IEEE80211_TX_RC_MCS &&

			  !ieee80211_is_data(fc),
@@ -279,6 +281,8 @@ static u32 iwl_mvm_get_tx_rate(struct iwl_mvm *mvm, 
			  le16_to_cpu(fc), mvmsta->sta_state);



		rate_idx = info->control.rates[0].idx;

	}



	/* if the rate isn't a well known legacy rate, take the lowest one */

	if (rate_idx < 0 || rate_idx >= IWL_RATE_COUNT_LEGACY)

		rate_idx = rate_lowest_index(