mac80211: clean up rate encoding bits in RX status

[karo-tx-linux.git] / drivers / net / wireless / mediatek / mt7601u / mac.c

diff --git a/drivers/net/wireless/mediatek/mt7601u/mac.c b/drivers/net/wireless/mediatek/mt7601u/mac.c
index 3c576392ed8994a4ec73291934f50cbc7890d059..064cad0f093820343d0806343970ef2665bbae70 100644 (file)
--- a/drivers/net/wireless/mediatek/mt7601u/mac.c
+++ b/drivers/net/wireless/mediatek/mt7601u/mac.c
@@ -401,7 +401,7 @@ mt76_mac_process_rate(struct ieee80211_rx_status *status, u16 rate)
        case MT_PHY_TYPE_CCK:
                if (idx >= 8) {
                        idx -= 8;
-                       status->flag |= RX_FLAG_SHORTPRE;
+                       status->enc_flags |= RX_ENC_FLAG_SHORTPRE;
                }
 
                if (WARN_ON(idx >= 4))
@@ -410,10 +410,10 @@ mt76_mac_process_rate(struct ieee80211_rx_status *status, u16 rate)
                status->rate_idx = idx;
                return;
        case MT_PHY_TYPE_HT_GF:
-               status->flag |= RX_FLAG_HT_GF;
+               status->enc_flags |= RX_ENC_FLAG_HT_GF;
                /* fall through */
        case MT_PHY_TYPE_HT:
-               status->flag |= RX_FLAG_HT;
+               status->enc_flags |= RX_ENC_FLAG_HT;
                status->rate_idx = idx;
                break;
        default:
@@ -422,13 +422,13 @@ mt76_mac_process_rate(struct ieee80211_rx_status *status, u16 rate)
        }
 
        if (rate & MT_RXWI_RATE_SGI)
-               status->flag |= RX_FLAG_SHORT_GI;
+               status->enc_flags |= RX_ENC_FLAG_SHORT_GI;
 
        if (rate & MT_RXWI_RATE_STBC)
-               status->flag |= 1 << RX_FLAG_STBC_SHIFT;
+               status->enc_flags |= 1 << RX_ENC_FLAG_STBC_SHIFT;
 
        if (rate & MT_RXWI_RATE_BW)
-               status->flag |= RX_FLAG_40MHZ;
+               status->enc_flags |= RX_ENC_FLAG_40MHZ;
 }
 
 static void