mt76: move mt76x02_tx_prepare_skb in mt76x02_txrx.c

Move mt76x02_tx_prepare_skb routine in mt76x02-lib module in order
to be reused by mt76x0 driver in tx datapath

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index f7325ee10a1e6e043b5bf042d4f3a0670a7a1852..2905bd964dc2df35fb89498c49f8d183f3b64884 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -150,6 +150,10 @@ void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
                          struct sk_buff *skb);
 void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
                struct sk_buff *skb);
+int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
+                          struct sk_buff *skb, struct mt76_queue *q,
+                          struct mt76_wcid *wcid, struct ieee80211_sta *sta,
+                          u32 *tx_info);
 
 extern const u16 mt76x02_beacon_offsets[16];
 void mt76x02_set_beacon_offsets(struct mt76_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
index ebd61c0e40c5cce1791dab19089ecc777d4150ea..ab7877a07b6cb8021499e284397d068594713645 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c
@@ -187,3 +187,35 @@ bool mt76x02_tx_status_data(struct mt76_dev *dev, u8 *update)
        return true;
 }
 EXPORT_SYMBOL_GPL(mt76x02_tx_status_data);
+
+int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
+                          struct sk_buff *skb, struct mt76_queue *q,
+                          struct mt76_wcid *wcid, struct ieee80211_sta *sta,
+                          u32 *tx_info)
+{
+       struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
+       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+       int qsel = MT_QSEL_EDCA;
+       int ret;
+
+       if (q == &dev->mt76.q_tx[MT_TXQ_PSD] && wcid && wcid->idx < 128)
+               mt76x02_mac_wcid_set_drop(&dev->mt76, wcid->idx, false);
+
+       mt76x02_mac_write_txwi(mdev, txwi, skb, wcid, sta, skb->len);
+
+       ret = mt76x02_insert_hdr_pad(skb);
+       if (ret < 0)
+               return ret;
+
+       if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
+               qsel = MT_QSEL_MGMT;
+
+       *tx_info = FIELD_PREP(MT_TXD_INFO_QSEL, qsel) |
+                  MT_TXD_INFO_80211;
+
+       if (!wcid || wcid->hw_key_idx == 0xff || wcid->sw_iv)
+               *tx_info |= MT_TXD_INFO_WIV;
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(mt76x02_tx_prepare_skb);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
index 26c1a24c4a2d2d6fbf735bce13dc6bc6d30322aa..e29ce8d23a4f9c64f3f5b333e79a321a85e37342 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h
@@ -86,10 +86,6 @@ void mt76x2_dma_cleanup(struct mt76x02_dev *dev);
 
 void mt76x2_cleanup(struct mt76x02_dev *dev);
 
-int mt76x2_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
-                         struct sk_buff *skb, struct mt76_queue *q,
-                         struct mt76_wcid *wcid, struct ieee80211_sta *sta,
-                         u32 *tx_info);
 void mt76x2_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,
                            struct mt76_queue_entry *e, bool flush);
 void mt76x2_mac_set_tx_protection(struct mt76x02_dev *dev, u32 val);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
index 194181275611cdd8c049476eaf3681e8d945b223..055c90b1e522f2dcef29f77a8a17929a0376217e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c
@@ -355,7 +355,7 @@ struct mt76x02_dev *mt76x2_alloc_device(struct device *pdev)
        static const struct mt76_driver_ops drv_ops = {
                .txwi_size = sizeof(struct mt76x02_txwi),
                .update_survey = mt76x2_update_channel,
-               .tx_prepare_skb = mt76x2_tx_prepare_skb,
+               .tx_prepare_skb = mt76x02_tx_prepare_skb,
                .tx_complete_skb = mt76x2_tx_complete_skb,
                .rx_skb = mt76x02_queue_rx_skb,
                .rx_poll_complete = mt76x2_rx_poll_complete,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_tx.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_tx.c
index cfc9d3d207df737f307b1b78bf228a0fa8c601a5..3a2ec86d3e887771e74d1eadd3900a587d8a5669 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_tx.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_tx.c
@@ -22,37 +22,6 @@ struct beacon_bc_data {
        struct sk_buff *tail[8];
 };
 
-int mt76x2_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
-                         struct sk_buff *skb, struct mt76_queue *q,
-                         struct mt76_wcid *wcid, struct ieee80211_sta *sta,
-                         u32 *tx_info)
-{
-       struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76);
-       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-       int qsel = MT_QSEL_EDCA;
-       int ret;
-
-       if (q == &dev->mt76.q_tx[MT_TXQ_PSD] && wcid && wcid->idx < 128)
-               mt76x02_mac_wcid_set_drop(&dev->mt76, wcid->idx, false);
-
-       mt76x02_mac_write_txwi(mdev, txwi, skb, wcid, sta, skb->len);
-
-       ret = mt76x02_insert_hdr_pad(skb);
-       if (ret < 0)
-               return ret;
-
-       if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
-               qsel = MT_QSEL_MGMT;
-
-       *tx_info = FIELD_PREP(MT_TXD_INFO_QSEL, qsel) |
-                  MT_TXD_INFO_80211;
-
-       if (!wcid || wcid->hw_key_idx == 0xff || wcid->sw_iv)
-               *tx_info |= MT_TXD_INFO_WIV;
-
-       return 0;
-}
-
 static void
 mt76x2_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
 {