Commit 0e394135 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: iwlwifi: mvm: clarify EHT RU allocation bits 



Calling this IWL_RX_PHY_DATA1_EHT_B0 is just confusing,
it's the RU allocation bit 0. Also then align the name
for B1-B7 accordingly.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230531194629.824edb28c0eb.Ia9f74573e3ac771911b679558984f1bfb36de674@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f9f5cc86

drivers/net/wireless/intel/iwlwifi/fw/api/rx.h

+2 −2
Original line number Diff line number Diff line
@@ -367,8 +367,8 @@ enum iwl_rx_phy_eht_data1 { 
	/* number of EHT-LTF symbols 0 - 1 EHT-LTF, 1 - 2 EHT-LTFs, 2 - 4 EHT-LTFs,

	 * 3 - 6 EHT-LTFs, 4 - 8 EHT-LTFs */

	IWL_RX_PHY_DATA1_EHT_SIG_LTF_NUM		= 0x000000e0,

	IWL_RX_PHY_DATA1_EHT_B0				= 0x00000100,

	IWL_RX_PHY_DATA1_EHT_RU_B1_B7_ALLOC		= 0x0000fe00,

	IWL_RX_PHY_DATA1_EHT_RU_ALLOC_B0		= 0x00000100,

	IWL_RX_PHY_DATA1_EHT_RU_ALLOC_B1_B7		= 0x0000fe00,

};



/* goes into Metadata DW 7 */

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

+2 −2
Original line number Diff line number Diff line
@@ -1775,9 +1775,9 @@ static void iwl_mvm_decode_eht_phy_data(struct iwl_mvm *mvm, 
	eht->known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_RU_ALLOC_TB_FMT);

	eht->data[8] |= LE32_DEC_ENC(data0, IWL_RX_PHY_DATA0_EHT_PS160,

				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_PS_160);

	eht->data[8] |= LE32_DEC_ENC(data1, IWL_RX_PHY_DATA1_EHT_B0,

	eht->data[8] |= LE32_DEC_ENC(data1, IWL_RX_PHY_DATA1_EHT_RU_ALLOC_B0,

				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B0);

	eht->data[8] |= LE32_DEC_ENC(data1, IWL_RX_PHY_DATA1_EHT_RU_B1_B7_ALLOC,

	eht->data[8] |= LE32_DEC_ENC(data1, IWL_RX_PHY_DATA1_EHT_RU_ALLOC_B1_B7,

				     IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1);



	iwl_mvm_decode_eht_ru(mvm, rx_status, eht);