mt76: connac: move mt76_connac_lmac_mapping in mt76-connac module

mt76_connac_lmac_mapping is shared between mt7921 and mt7915

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac.h b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
index b353c26..e624843 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac.h
@@ -159,6 +159,12 @@ static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def *chandef)
        return width_to_bw[chandef->width];
 }
 
+static inline u8 mt76_connac_lmac_mapping(u8 ac)
+{
+       /* LMAC uses the reverse order of mac80211 AC indexes */
+       return 3 - ac;
+}
+
 int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm);
 void mt76_connac_power_save_sched(struct mt76_phy *phy,
                                  struct mt76_connac_pm *pm);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index abedd45..bb3654f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -165,7 +165,7 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev)
                sta = container_of((void *)msta, struct ieee80211_sta,
                                   drv_priv);
                for (i = 0; i < IEEE80211_NUM_ACS; i++) {
-                       u8 q = mt7915_lmac_mapping(dev, i);
+                       u8 q = mt76_connac_lmac_mapping(i);
                        u32 tx_cur = tx_time[q];
                        u32 rx_cur = rx_time[q];
                        u8 tid = ac_to_tid[i];
@@ -1206,7 +1206,7 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi,
        } else {
                p_fmt = MT_TX_TYPE_CT;
                q_idx = wmm_idx * MT7915_MAX_WMM_SETS +
-                       mt7915_lmac_mapping(dev, skb_get_queue_mapping(skb));
+                       mt76_connac_lmac_mapping(skb_get_queue_mapping(skb));
        }
 
        val = FIELD_PREP(MT_TXD0_TX_BYTES, skb->len + MT_TXD_SIZE) |

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 3d0a7c5..1149aae 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -509,11 +509,10 @@ static int
 mt7915_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
               const struct ieee80211_tx_queue_params *params)
 {
-       struct mt7915_dev *dev = mt7915_hw_dev(hw);
        struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
 
        /* no need to update right away, we'll get BSS_CHANGED_QOS */
-       queue = mt7915_lmac_mapping(dev, queue);
+       queue = mt76_connac_lmac_mapping(queue);
        mvif->queue_params[queue] = *params;
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index f5c22b8..bc3a3dc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -378,12 +378,6 @@ mt7915_ext_phy(struct mt7915_dev *dev)
        return phy->priv;
 }
 
-static inline u8 mt7915_lmac_mapping(struct mt7915_dev *dev, u8 ac)
-{
-       /* LMAC uses the reverse order of mac80211 AC indexes */
-       return 3 - ac;
-}
-
 extern const struct ieee80211_ops mt7915_ops;
 extern const struct mt76_testmode_ops mt7915_testmode_ops;
 extern struct pci_driver mt7915_pci_driver;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
index 8300f26..83da21d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
@@ -250,7 +250,7 @@ done:
        mt7915_tm_set_slot_time(phy, slot_time, sifs);
 
        return mt7915_tm_set_wmm_qid(dev,
-                                    mt7915_lmac_mapping(dev, IEEE80211_AC_BE),
+                                    mt76_connac_lmac_mapping(IEEE80211_AC_BE),
                                     aifsn, cw, cw, 0);
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index cc07018..80a1492 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -116,7 +116,7 @@ void mt7921_mac_sta_poll(struct mt7921_dev *dev)
                sta = container_of((void *)msta, struct ieee80211_sta,
                                   drv_priv);
                for (i = 0; i < IEEE80211_NUM_ACS; i++) {
-                       u8 q = mt7921_lmac_mapping(dev, i);
+                       u8 q = mt76_connac_lmac_mapping(i);
                        u32 tx_cur = tx_time[q];
                        u32 rx_cur = rx_time[q];
                        u8 tid = ac_to_tid[i];
@@ -950,7 +950,7 @@ void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi,
        } else {
                p_fmt = is_mmio ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;
                q_idx = wmm_idx * MT7921_MAX_WMM_SETS +
-                       mt7921_lmac_mapping(dev, skb_get_queue_mapping(skb));
+                       mt76_connac_lmac_mapping(skb_get_queue_mapping(skb));
        }
 
        val = FIELD_PREP(MT_TXD0_TX_BYTES, skb->len + sz_txd) |

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 0444ef3..b6e836a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -539,11 +539,10 @@ static int
 mt7921_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
               const struct ieee80211_tx_queue_params *params)
 {
-       struct mt7921_dev *dev = mt7921_hw_dev(hw);
        struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
 
        /* no need to update right away, we'll get BSS_CHANGED_QOS */
-       queue = mt7921_lmac_mapping(dev, queue);
+       queue = mt76_connac_lmac_mapping(queue);
        mvif->queue_params[queue] = *params;
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index c401fbb..9edc83f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -272,12 +272,6 @@ mt7921_hw_dev(struct ieee80211_hw *hw)
 #define mt7921_mutex_release(dev)      \
        mt76_connac_mutex_release(&(dev)->mt76, &(dev)->pm)
 
-static inline u8 mt7921_lmac_mapping(struct mt7921_dev *dev, u8 ac)
-{
-       /* LMAC uses the reverse order of mac80211 AC indexes */
-       return 3 - ac;
-}
-
 extern const struct ieee80211_ops mt7921_ops;
 extern struct pci_driver mt7921_pci_driver;