Merge remote-tracking branch 'keys/keys-next'

[deliverable/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 e21c53ed09fb902b91793b792f21762779e89345..3c576392ed8994a4ec73291934f50cbc7890d059 100644 (file)
--- a/drivers/net/wireless/mediatek/mt7601u/mac.c
+++ b/drivers/net/wireless/mediatek/mt7601u/mac.c
@@ -19,13 +19,13 @@
 static void
 mt76_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate)
 {
-       u8 idx = MT76_GET(MT_TXWI_RATE_MCS, rate);
+       u8 idx = FIELD_GET(MT_TXWI_RATE_MCS, rate);
 
        txrate->idx = 0;
        txrate->flags = 0;
        txrate->count = 1;
 
-       switch (MT76_GET(MT_TXWI_RATE_PHY_MODE, rate)) {
+       switch (FIELD_GET(MT_TXWI_RATE_PHY_MODE, rate)) {
        case MT_PHY_TYPE_OFDM:
                txrate->idx = idx + 4;
                return;
@@ -47,7 +47,7 @@ mt76_mac_process_tx_rate(struct ieee80211_tx_rate *txrate, u16 rate)
                return;
        }
 
-       if (MT76_GET(MT_TXWI_RATE_BW, rate) == MT_PHY_BW_40)
+       if (FIELD_GET(MT_TXWI_RATE_BW, rate) == MT_PHY_BW_40)
                txrate->flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
 
        if (rate & MT_TXWI_RATE_SGI)
@@ -125,9 +125,9 @@ u16 mt76_mac_tx_rate_val(struct mt7601u_dev *dev,
                bw = 0;
        }
 
-       rateval = MT76_SET(MT_RXWI_RATE_MCS, rate_idx);
-       rateval |= MT76_SET(MT_RXWI_RATE_PHY, phy);
-       rateval |= MT76_SET(MT_RXWI_RATE_BW, bw);
+       rateval = FIELD_PREP(MT_RXWI_RATE_MCS, rate_idx);
+       rateval |= FIELD_PREP(MT_RXWI_RATE_PHY, phy);
+       rateval |= FIELD_PREP(MT_RXWI_RATE_BW, bw);
        if (rate->flags & IEEE80211_TX_RC_SHORT_GI)
                rateval |= MT_RXWI_RATE_SGI;
 
@@ -156,9 +156,9 @@ struct mt76_tx_status mt7601u_mac_fetch_tx_status(struct mt7601u_dev *dev)
        stat.success = !!(val & MT_TX_STAT_FIFO_SUCCESS);
        stat.aggr = !!(val & MT_TX_STAT_FIFO_AGGR);
        stat.ack_req = !!(val & MT_TX_STAT_FIFO_ACKREQ);
-       stat.pktid = MT76_GET(MT_TX_STAT_FIFO_PID_TYPE, val);
-       stat.wcid = MT76_GET(MT_TX_STAT_FIFO_WCID, val);
-       stat.rate = MT76_GET(MT_TX_STAT_FIFO_RATE, val);
+       stat.pktid = FIELD_GET(MT_TX_STAT_FIFO_PID_TYPE, val);
+       stat.wcid = FIELD_GET(MT_TX_STAT_FIFO_WCID, val);
+       stat.rate = FIELD_GET(MT_TX_STAT_FIFO_RATE, val);
 
        return stat;
 }
@@ -270,7 +270,7 @@ void mt7601u_mac_config_tsf(struct mt7601u_dev *dev, bool enable, int interval)
        }
 
        val &= ~MT_BEACON_TIME_CFG_INTVAL;
-       val |= MT76_SET(MT_BEACON_TIME_CFG_INTVAL, interval << 4) |
+       val |= FIELD_PREP(MT_BEACON_TIME_CFG_INTVAL, interval << 4) |
                MT_BEACON_TIME_CFG_TIMER_EN |
                MT_BEACON_TIME_CFG_SYNC_MODE |
                MT_BEACON_TIME_CFG_TBTT_EN;
@@ -349,8 +349,8 @@ mt7601u_mac_wcid_setup(struct mt7601u_dev *dev, u8 idx, u8 vif_idx, u8 *mac)
        u8 zmac[ETH_ALEN] = {};
        u32 attr;
 
-       attr = MT76_SET(MT_WCID_ATTR_BSS_IDX, vif_idx & 7) |
-              MT76_SET(MT_WCID_ATTR_BSS_IDX_EXT, !!(vif_idx & 8));
+       attr = FIELD_PREP(MT_WCID_ATTR_BSS_IDX, vif_idx & 7) |
+              FIELD_PREP(MT_WCID_ATTR_BSS_IDX_EXT, !!(vif_idx & 8));
 
        mt76_wr(dev, MT_WCID_ATTR(idx), attr);
 
@@ -382,15 +382,15 @@ void mt7601u_mac_set_ampdu_factor(struct mt7601u_dev *dev)
        rcu_read_unlock();
 
        mt7601u_wr(dev, MT_MAX_LEN_CFG, 0xa0fff |
-                  MT76_SET(MT_MAX_LEN_CFG_AMPDU, min_factor));
+                  FIELD_PREP(MT_MAX_LEN_CFG_AMPDU, min_factor));
 }
 
 static void
 mt76_mac_process_rate(struct ieee80211_rx_status *status, u16 rate)
 {
-       u8 idx = MT76_GET(MT_RXWI_RATE_MCS, rate);
+       u8 idx = FIELD_GET(MT_RXWI_RATE_MCS, rate);
 
-       switch (MT76_GET(MT_RXWI_RATE_PHY, rate)) {
+       switch (FIELD_GET(MT_RXWI_RATE_PHY, rate)) {
        case MT_PHY_TYPE_OFDM:
                if (WARN_ON(idx >= 8))
                        idx = 0;
@@ -436,7 +436,7 @@ mt7601u_rx_monitor_beacon(struct mt7601u_dev *dev, struct mt7601u_rxwi *rxwi,
                          u16 rate, int rssi)
 {
        dev->bcn_freq_off = rxwi->freq_off;
-       dev->bcn_phy_mode = MT76_GET(MT_RXWI_RATE_PHY, rate);
+       dev->bcn_phy_mode = FIELD_GET(MT_RXWI_RATE_PHY, rate);
        dev->avg_rssi = (dev->avg_rssi * 15) / 16 + (rssi << 8);
 }
 
@@ -458,7 +458,7 @@ u32 mt76_mac_process_rx(struct mt7601u_dev *dev, struct sk_buff *skb,
        u16 rate = le16_to_cpu(rxwi->rate);
        int rssi;
 
-       len = MT76_GET(MT_RXWI_CTL_MPDU_LEN, ctl);
+       len = FIELD_GET(MT_RXWI_CTL_MPDU_LEN, ctl);
        if (len < 10)
                return 0;
 
@@ -542,8 +542,8 @@ int mt76_mac_wcid_set_key(struct mt7601u_dev *dev, u8 idx,
 
        val = mt7601u_rr(dev, MT_WCID_ATTR(idx));
        val &= ~MT_WCID_ATTR_PKEY_MODE & ~MT_WCID_ATTR_PKEY_MODE_EXT;
-       val |= MT76_SET(MT_WCID_ATTR_PKEY_MODE, cipher & 7) |
-              MT76_SET(MT_WCID_ATTR_PKEY_MODE_EXT, cipher >> 3);
+       val |= FIELD_PREP(MT_WCID_ATTR_PKEY_MODE, cipher & 7) |
+              FIELD_PREP(MT_WCID_ATTR_PKEY_MODE_EXT, cipher >> 3);
        val &= ~MT_WCID_ATTR_PAIRWISE;
        val |= MT_WCID_ATTR_PAIRWISE *
                !!(key && key->flags & IEEE80211_KEY_FLAG_PAIRWISE);