3 @@ -46,7 +46,7 @@ mt76x2_mac_process_rate(struct ieee80211
7 - status->flag |= RX_FLAG_SHORTPRE;
8 + status->enc_flags |= RX_ENC_FLAG_SHORTPRE;
12 @@ -55,16 +55,16 @@ mt76x2_mac_process_rate(struct ieee80211
13 status->rate_idx = idx;
15 case MT_PHY_TYPE_HT_GF:
16 - status->flag |= RX_FLAG_HT_GF;
17 + status->enc_flags |= RX_ENC_FLAG_HT_GF;
20 - status->flag |= RX_FLAG_HT;
21 + status->encoding = RX_ENC_HT;
22 status->rate_idx = idx;
25 - status->flag |= RX_FLAG_VHT;
26 + status->encoding = RX_ENC_VHT;
27 status->rate_idx = FIELD_GET(MT_RATE_INDEX_VHT_IDX, idx);
28 - status->vht_nss = FIELD_GET(MT_RATE_INDEX_VHT_NSS, idx) + 1;
29 + status->nss = FIELD_GET(MT_RATE_INDEX_VHT_NSS, idx) + 1;
33 @@ -72,22 +72,22 @@ mt76x2_mac_process_rate(struct ieee80211
36 if (rate & MT_RXWI_RATE_LDPC)
37 - status->flag |= RX_FLAG_LDPC;
38 + status->enc_flags |= RX_ENC_FLAG_LDPC;
40 if (rate & MT_RXWI_RATE_SGI)
41 - status->flag |= RX_FLAG_SHORT_GI;
42 + status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
44 if (rate & MT_RXWI_RATE_STBC)
45 - status->flag |= 1 << RX_FLAG_STBC_SHIFT;
46 + status->enc_flags |= 1 << RX_ENC_FLAG_STBC_SHIFT;
48 switch (FIELD_GET(MT_RXWI_RATE_BW, rate)) {
52 - status->flag |= RX_FLAG_40MHZ;
53 + status->bw = RATE_INFO_BW_40;
56 - status->vht_flag |= RX_VHT_FLAG_80MHZ;
57 + status->bw = RATE_INFO_BW_80;
63 @@ -411,19 +411,19 @@ mt7603_mac_fill_rx(struct mt7603_dev *de
65 case MT_PHY_TYPE_HT_GF:
67 - status->flag |= RX_FLAG_HT;
68 + status->encoding = RX_ENC_HT;
71 - status->flag |= RX_FLAG_VHT;
72 + status->encoding = RX_ENC_VHT;
78 if (rxdg0 & MT_RXV1_HT_SHORT_GI)
79 - status->flag |= RX_FLAG_SHORT_GI;
80 + status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
82 - status->flag |= RX_FLAG_STBC_MASK *
83 + status->enc_flags |= RX_ENC_FLAG_STBC_MASK *
84 FIELD_GET(MT_RXV1_HT_STBC, rxdg0);