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

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
...@@ -689,7 +689,7 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, ...@@ -689,7 +689,7 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar,
} }
status->rate_idx = mcs; status->rate_idx = mcs;
status->vht_nss = nss; status->nss = nss;
if (sgi) if (sgi)
status->enc_flags |= RX_ENC_FLAG_SHORT_GI; status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
...@@ -874,7 +874,7 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar, ...@@ -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. */ /* New PPDU starts so clear out the old per-PPDU status. */
status->freq = 0; status->freq = 0;
status->rate_idx = 0; status->rate_idx = 0;
status->vht_nss = 0; status->nss = 0;
status->encoding = RX_ENC_LEGACY; status->encoding = RX_ENC_LEGACY;
status->bw = RATE_INFO_BW_20; status->bw = RATE_INFO_BW_20;
status->flag &= ~RX_FLAG_MACTIME_END; status->flag &= ~RX_FLAG_MACTIME_END;
...@@ -946,7 +946,7 @@ static void ath10k_process_rx(struct ath10k *ar, ...@@ -946,7 +946,7 @@ static void ath10k_process_rx(struct ath10k *ar,
(status->bw == RATE_INFO_BW_160) ? "160" : "", (status->bw == RATE_INFO_BW_160) ? "160" : "",
status->enc_flags & RX_ENC_FLAG_SHORT_GI ? "sgi " : "", status->enc_flags & RX_ENC_FLAG_SHORT_GI ? "sgi " : "",
status->rate_idx, status->rate_idx,
status->vht_nss, status->nss,
status->freq, status->freq,
status->band, status->flag, status->band, status->flag,
!!(status->flag & RX_FLAG_FAILED_FCS_CRC), !!(status->flag & RX_FLAG_FAILED_FCS_CRC),
......
...@@ -451,7 +451,7 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, ...@@ -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) { } else if (rate_n_flags & RATE_MCS_VHT_MSK) {
u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >> u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >>
RATE_MCS_STBC_POS; RATE_MCS_STBC_POS;
rx_status->vht_nss = rx_status->nss =
((rate_n_flags & RATE_VHT_MCS_NSS_MSK) >> ((rate_n_flags & RATE_VHT_MCS_NSS_MSK) >>
RATE_VHT_MCS_NSS_POS) + 1; RATE_VHT_MCS_NSS_POS) + 1;
rx_status->rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK; rx_status->rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK;
......
...@@ -982,7 +982,7 @@ void iwl_mvm_rx_mpdu_mq(struct iwl_mvm *mvm, struct napi_struct *napi, ...@@ -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) { } else if (rate_n_flags & RATE_MCS_VHT_MSK) {
u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >> u8 stbc = (rate_n_flags & RATE_MCS_VHT_STBC_MSK) >>
RATE_MCS_STBC_POS; RATE_MCS_STBC_POS;
rx_status->vht_nss = rx_status->nss =
((rate_n_flags & RATE_VHT_MCS_NSS_MSK) >> ((rate_n_flags & RATE_VHT_MCS_NSS_MSK) >>
RATE_VHT_MCS_NSS_POS) + 1; RATE_VHT_MCS_NSS_POS) + 1;
rx_status->rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK; rx_status->rate_idx = rate_n_flags & RATE_VHT_MCS_RATE_CODE_MSK;
......
...@@ -1192,7 +1192,7 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw, ...@@ -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) { if (info->control.rates[0].flags & IEEE80211_TX_RC_VHT_MCS) {
rx_status.rate_idx = rx_status.rate_idx =
ieee80211_rate_get_vht_mcs(&info->control.rates[0]); 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]); ieee80211_rate_get_vht_nss(&info->control.rates[0]);
rx_status.encoding = RX_ENC_VHT; rx_status.encoding = RX_ENC_VHT;
} else { } else {
......
...@@ -531,7 +531,7 @@ bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw, ...@@ -531,7 +531,7 @@ bool rtl8821ae_rx_query_desc(struct ieee80211_hw *hw,
if (status->is_short_gi) if (status->is_short_gi)
rx_status->enc_flags |= RX_ENC_FLAG_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; rx_status->flag |= RX_FLAG_MACTIME_START;
/* hw will set status->decrypted true, if it finds the /* hw will set status->decrypted true, if it finds the
......
...@@ -1171,7 +1171,7 @@ enum mac80211_rx_encoding { ...@@ -1171,7 +1171,7 @@ enum mac80211_rx_encoding {
* @antenna: antenna used * @antenna: antenna used
* @rate_idx: index of data rate into band's supported rates or MCS index if * @rate_idx: index of data rate into band's supported rates or MCS index if
* HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT) * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT)
* @vht_nss: number of streams (VHT only) * @nss: number of streams (VHT and HE only)
* @flag: %RX_FLAG_\* * @flag: %RX_FLAG_\*
* @encoding: &enum mac80211_rx_encoding * @encoding: &enum mac80211_rx_encoding
* @bw: &enum rate_info_bw * @bw: &enum rate_info_bw
...@@ -1191,7 +1191,7 @@ struct ieee80211_rx_status { ...@@ -1191,7 +1191,7 @@ struct ieee80211_rx_status {
u8 enc_flags; u8 enc_flags;
u8 encoding:2, bw:3; u8 encoding:2, bw:3;
u8 rate_idx; u8 rate_idx;
u8 vht_nss; u8 nss;
u8 rx_flags; u8 rx_flags;
u8 band; u8 band;
u8 antenna; u8 antenna;
......
...@@ -479,7 +479,7 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, ...@@ -479,7 +479,7 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
*pos++ = 0; *pos++ = 0;
} }
/* MCS/NSS */ /* MCS/NSS */
*pos = (status->rate_idx << 4) | status->vht_nss; *pos = (status->rate_idx << 4) | status->nss;
pos += 4; pos += 4;
/* coding field */ /* coding field */
if (status->enc_flags & RX_ENC_FLAG_LDPC) if (status->enc_flags & RX_ENC_FLAG_LDPC)
...@@ -4308,10 +4308,10 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta, ...@@ -4308,10 +4308,10 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
break; break;
case RX_ENC_VHT: case RX_ENC_VHT:
if (WARN_ONCE(status->rate_idx > 9 || if (WARN_ONCE(status->rate_idx > 9 ||
!status->vht_nss || !status->nss ||
status->vht_nss > 8, status->nss > 8,
"Rate marked as a VHT rate but data is invalid: MCS: %d, NSS: %d\n", "Rate marked as a VHT rate but data is invalid: MCS: %d, NSS: %d\n",
status->rate_idx, status->vht_nss)) status->rate_idx, status->nss))
goto drop; goto drop;
break; break;
default: default:
......
...@@ -747,7 +747,7 @@ static inline u16 sta_stats_encode_rate(struct ieee80211_rx_status *s) ...@@ -747,7 +747,7 @@ static inline u16 sta_stats_encode_rate(struct ieee80211_rx_status *s)
switch (s->encoding) { switch (s->encoding) {
case RX_ENC_VHT: case RX_ENC_VHT:
r |= STA_STATS_RATE_TYPE_VHT | (s->vht_nss << 4); r |= STA_STATS_RATE_TYPE_VHT | (s->nss << 4);
break; break;
case RX_ENC_HT: case RX_ENC_HT:
r |= STA_STATS_RATE_TYPE_HT; r |= STA_STATS_RATE_TYPE_HT;
......
...@@ -2726,7 +2726,7 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, ...@@ -2726,7 +2726,7 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
case RX_ENC_VHT: case RX_ENC_VHT:
ri.flags |= RATE_INFO_FLAGS_VHT_MCS; ri.flags |= RATE_INFO_FLAGS_VHT_MCS;
ri.mcs = status->rate_idx; ri.mcs = status->rate_idx;
ri.nss = status->vht_nss; ri.nss = status->nss;
ri.bw = status->bw; ri.bw = status->bw;
if (status->enc_flags & RX_ENC_FLAG_SHORT_GI) if (status->enc_flags & RX_ENC_FLAG_SHORT_GI)
ri.flags |= RATE_INFO_FLAGS_SHORT_GI; ri.flags |= RATE_INFO_FLAGS_SHORT_GI;
...@@ -2773,7 +2773,7 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, ...@@ -2773,7 +2773,7 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
if (WARN_ONCE(!rate, if (WARN_ONCE(!rate,
"Invalid bitrate: flags=0x%llx, idx=%d, vht_nss=%d\n", "Invalid bitrate: flags=0x%llx, idx=%d, vht_nss=%d\n",
(unsigned long long)status->flag, status->rate_idx, (unsigned long long)status->flag, status->rate_idx,
status->vht_nss)) status->nss))
return 0; return 0;
/* rewind from end of MPDU */ /* rewind from end of MPDU */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment