Commit b55c1f4e authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

wifi: iwlwifi: Do not include radiotap EHT user info if not needed 



Do not include user information in radtiotap EHT data for EHT sounding
NDP as the frame doesn't include the user specific field. Instead,
encode the NSS and the beamforming information in the EHT data.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20230305124407.ac6474ded9bd.I9655589e9afbacc16820f35f6f5d90c6a91b8b05@changeid


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

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

+37 −21
Original line number Diff line number Diff line
@@ -1845,6 +1845,7 @@ static void iwl_mvm_rx_eht(struct iwl_mvm *mvm, struct sk_buff *skb, 


	struct ieee80211_radiotap_eht *eht;

	struct ieee80211_radiotap_eht_usig *usig;

	size_t eht_len = sizeof(*eht);



	u32 rate_n_flags = phy_data->rate_n_flags;

	u32 he_type = rate_n_flags & RATE_MCS_HE_TYPE_MSK;
@@ -1854,8 +1855,10 @@ static void iwl_mvm_rx_eht(struct iwl_mvm *mvm, struct sk_buff *skb, 
	u32 bw;



	/* u32 for 1 user_info */

	eht = iwl_mvm_radiotap_put_tlv(skb, IEEE80211_RADIOTAP_EHT,

				       sizeof(*eht) + sizeof(u32));

	if (phy_data->with_data)

		eht_len += sizeof(u32);



	eht = iwl_mvm_radiotap_put_tlv(skb, IEEE80211_RADIOTAP_EHT, eht_len);



	usig = iwl_mvm_radiotap_put_tlv(skb, IEEE80211_RADIOTAP_EHT_USIG,

					sizeof(*usig));
@@ -1946,8 +1949,20 @@ static void iwl_mvm_rx_eht(struct iwl_mvm *mvm, struct sk_buff *skb, 
				    rx_status->eht.gi));

	}



	eht->user_info[0] |= cpu_to_le32

		(IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN |



	if (!phy_data->with_data) {

		eht->known |= cpu_to_le32(IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S |

					  IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S);

		eht->data[7] |=

			le32_encode_bits(le32_get_bits(phy_data->rx_vec[2],

						       RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK),

					 IEEE80211_RADIOTAP_EHT_DATA7_NSS_S);

		if (rate_n_flags & RATE_MCS_BF_MSK)

			eht->data[7] |=

				cpu_to_le32(IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S);

	} else {

		eht->user_info[0] |=

			cpu_to_le32(IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN |

				    IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN |

				    IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O |

				    IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O |
@@ -1968,6 +1983,7 @@ static void iwl_mvm_rx_eht(struct iwl_mvm *mvm, struct sk_buff *skb, 
			 FIELD_PREP(IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O,

				    FIELD_GET(RATE_MCS_NSS_MSK, rate_n_flags)));

	}

}



static void iwl_mvm_rx_he(struct iwl_mvm *mvm, struct sk_buff *skb,

			  struct iwl_mvm_rx_phy_data *phy_data,