Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8613c948 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: rename ieee80211_rx_status::vht_nss to just nss 



This field will need to be used again for HE, so rename it now.

Again, mostly done with this spatch:

@@
expression status;
@@
-status->vht_nss
+status->nss
@@
expression status;
@@
-status.vht_nss
+status.nss

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

drivers/net/wireless/ath/ath10k/htt_rx.c

+3 −3
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
		}



		status->rate_idx = mcs;

		status->vht_nss = nss;

		status->nss = nss;



		if (sgi)

			status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
@@ -874,7 +874,7 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar, 
		/* New PPDU starts so clear out the old per-PPDU status. */

		status->freq = 0;

		status->rate_idx = 0;

		status->vht_nss = 0;

		status->nss = 0;

		status->encoding = RX_ENC_LEGACY;

		status->bw = RATE_INFO_BW_20;

		status->flag &= ~RX_FLAG_MACTIME_END;
@@ -946,7 +946,7 @@ static void ath10k_process_rx(struct ath10k *ar, 
		   (status->bw == RATE_INFO_BW_160) ? "160" : "",

		   status->enc_flags & RX_ENC_FLAG_SHORT_GI ? "sgi " : "",

		   status->rate_idx,

		   status->vht_nss,

		   status->nss,

		   status->freq,

		   status->band, status->flag,

		   !!(status->flag & RX_FLAG_FAILED_FCS_CRC),

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

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, 
	} else if (rate_n_flags & RATE_MCS_VHT_MSK) {

		u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >>

				RATE_MCS_STBC_POS;

		rx_status->vht_nss =

		rx_status->nss =

			((rate_n_flags & RATE_VHT_MCS_NSS_MSK) >>

						RATE_VHT_MCS_NSS_POS) + 1;

		rx_status->rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK;

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

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, 
	} else if (rate_n_flags & RATE_MCS_VHT_MSK) {

		u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >>

				RATE_MCS_STBC_POS;

		rx_status->vht_nss =

		rx_status->nss =

			((rate_n_flags & RATE_VHT_MCS_NSS_MSK) >>

						RATE_VHT_MCS_NSS_POS) + 1;

		rx_status->rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK;

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw, 
	if (info->control.rates[0].flags & IEEE80211_TX_RC_VHT_MCS) {

		rx_status.rate_idx =

			ieee80211_rate_get_vht_mcs(&info->control.rates[0]);

		rx_status.vht_nss =

		rx_status.nss =

			ieee80211_rate_get_vht_nss(&info->control.rates[0]);

		rx_status.encoding = RX_ENC_VHT;

	} else {

drivers/net/wireless/realtek/rtlwifi/rtl8821ae/trx.c

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw, 
	if (status->is_short_gi)

		rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI;



	rx_status->vht_nss = status->vht_nss;

	rx_status->nss = status->vht_nss;

	rx_status->flag |= RX_FLAG_MACTIME_START;



	/* hw will set status->decrypted true, if it finds the