A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 19:51:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

mac80211: rename ieee80211_rx_status::vht_nss to just nss

Browse source 
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: Johannes Berg <[email protected]>
This commit is contained in:
Johannes Berg 2017-04-26 13:51:41 +02:00
commit 8613c94815
9 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/mac80211/rx.c
View file

@ -479,7 +479,7 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local,
*pos++ = 0;
}
/* MCS/NSS */
*pos = (status->rate_idx << 4) | status->vht_nss;
*pos = (status->rate_idx << 4) | status->nss;
pos += 4;
/* coding field */
if (status->enc_flags & RX_ENC_FLAG_LDPC)
@ -4308,10 +4308,10 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
break;
case RX_ENC_VHT:
if (WARN_ONCE(status->rate_idx > 9 ||
!status->vht_nss ||
status->vht_nss > 8,
!status->nss ||
status->nss > 8,
"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;
break;
default:

2
net/mac80211/sta_info.h
View file

@ -747,7 +747,7 @@ static inline u16 sta_stats_encode_rate(struct ieee80211_rx_status *s)
switch (s->encoding) {
case RX_ENC_VHT:
r |= STA_STATS_RATE_TYPE_VHT | (s->vht_nss << 4);
r |= STA_STATS_RATE_TYPE_VHT | (s->nss << 4);
break;
case RX_ENC_HT:
r |= STA_STATS_RATE_TYPE_HT;

4
net/mac80211/util.c
View file

@ -2726,7 +2726,7 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
case RX_ENC_VHT:
ri.flags |= RATE_INFO_FLAGS_VHT_MCS;
ri.mcs = status->rate_idx;
ri.nss = status->vht_nss;
ri.nss = status->nss;
ri.bw = status->bw;
if (status->enc_flags & RX_ENC_FLAG_SHORT_GI)
ri.flags |= RATE_INFO_FLAGS_SHORT_GI;
@ -2773,7 +2773,7 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
if (WARN_ONCE(!rate,
"Invalid bitrate: flags=0x%llx, idx=%d, vht_nss=%d\n",
(unsigned long long)status->flag, status->rate_idx,
status->vht_nss))
status->nss))
return 0;
/* rewind from end of MPDU */