3 @@ -642,11 +642,11 @@ static void ath10k_htt_rx_h_rates(struct
4 sgi = (info3 >> 7) & 1;
6 status->rate_idx = mcs;
7 - status->flag |= RX_FLAG_HT;
8 + status->encoding = RX_ENC_HT;
10 - status->flag |= RX_FLAG_SHORT_GI;
11 + status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
13 - status->flag |= RX_FLAG_40MHZ;
14 + status->bw = RATE_INFO_BW_40;
17 case HTT_RX_VHT_WITH_TXBF:
18 @@ -698,10 +698,10 @@ static void ath10k_htt_rx_h_rates(struct
21 status->rate_idx = mcs;
22 - status->vht_nss = nss;
26 - status->flag |= RX_FLAG_SHORT_GI;
27 + status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
31 @@ -709,18 +709,18 @@ static void ath10k_htt_rx_h_rates(struct
35 - status->flag |= RX_FLAG_40MHZ;
36 + status->bw = RATE_INFO_BW_40;
40 - status->vht_flag |= RX_VHT_FLAG_80MHZ;
41 + status->bw = RATE_INFO_BW_80;
44 - status->vht_flag |= RX_VHT_FLAG_160MHZ;
45 + status->bw = RATE_INFO_BW_160;
49 - status->flag |= RX_FLAG_VHT;
50 + status->encoding = RX_ENC_VHT;
54 @@ -900,13 +900,10 @@ static void ath10k_htt_rx_h_ppdu(struct
55 /* New PPDU starts so clear out the old per-PPDU status. */
58 - status->vht_nss = 0;
59 - status->vht_flag &= ~RX_VHT_FLAG_80MHZ;
60 - status->flag &= ~(RX_FLAG_HT |
64 - RX_FLAG_MACTIME_END);
66 + status->encoding = RX_ENC_LEGACY;
67 + status->bw = RATE_INFO_BW_20;
68 + status->flag &= ~RX_FLAG_MACTIME_END;
69 status->flag |= RX_FLAG_NO_SIGNAL_VAL;
71 ath10k_htt_rx_h_signal(ar, status, rxd);
72 @@ -959,7 +956,7 @@ static void ath10k_process_rx(struct ath
75 ath10k_dbg(ar, ATH10K_DBG_DATA,
76 - "rx skb %p len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%llx fcs-err %i mic-err %i amsdu-more %i\n",
77 + "rx skb %p len %u peer %pM %s %s sn %u %s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n",
80 ieee80211_get_SA(hdr),
81 @@ -967,15 +964,15 @@ static void ath10k_process_rx(struct ath
82 is_multicast_ether_addr(ieee80211_get_DA(hdr)) ?
84 (__le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_SEQ) >> 4,
85 - status->flag == 0 ? "legacy" : "",
86 - status->flag & RX_FLAG_HT ? "ht" : "",
87 - status->flag & RX_FLAG_VHT ? "vht" : "",
88 - status->flag & RX_FLAG_40MHZ ? "40" : "",
89 - status->vht_flag & RX_VHT_FLAG_80MHZ ? "80" : "",
90 - status->vht_flag & RX_VHT_FLAG_160MHZ ? "160" : "",
91 - status->flag & RX_FLAG_SHORT_GI ? "sgi " : "",
92 + (status->encoding == RX_ENC_LEGACY) ? "legacy" : "",
93 + (status->encoding == RX_ENC_HT) ? "ht" : "",
94 + (status->encoding == RX_ENC_VHT) ? "vht" : "",
95 + (status->bw == RATE_INFO_BW_40) ? "40" : "",
96 + (status->bw == RATE_INFO_BW_80) ? "80" : "",
97 + (status->bw == RATE_INFO_BW_160) ? "160" : "",
98 + status->enc_flags & RX_ENC_FLAG_SHORT_GI ? "sgi " : "",
103 status->band, status->flag,
104 !!(status->flag & RX_FLAG_FAILED_FCS_CRC),