mt76: move mt76x02_rx_get_sta and mt76x02_rx_get_sta_wcid in mt76x02_util.h

Move mt76x02_rx_get_sta and mt76x02_rx_get_sta_wcid utility routines in
mt76x02-lib module since it will be used by mt76x0 driver in order to
unify rxwi parsing

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

2 files changed, 31 insertions, 30 deletions

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.h b/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
index 54cec0cbf645..f78526fcf423 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.h
@@ -18,6 +18,8 @@
 #ifndef __MT76X02_UTIL_H
 #define __MT76X02_UTIL_H
 
+#include "mt76x02_mac.h"
+
 extern struct ieee80211_rate mt76x02_rates[12];
 
 void mt76x02_configure_filter(struct ieee80211_hw *hw,
@@ -77,4 +79,31 @@ mt76x02_wait_for_txrx_idle(struct mt76_dev *dev)
                                 0, 100);
 }
 
+static inline struct mt76x02_sta *
+mt76x02_rx_get_sta(struct mt76_dev *dev, u8 idx)
+{
+        struct mt76_wcid *wcid;
+
+        if (idx >= ARRAY_SIZE(dev->wcid))
+                return NULL;
+
+        wcid = rcu_dereference(dev->wcid[idx]);
+        if (!wcid)
+                return NULL;
+
+        return container_of(wcid, struct mt76x02_sta, wcid);
+}
+
+static inline struct mt76_wcid *
+mt76x02_rx_get_sta_wcid(struct mt76x02_sta *sta, bool unicast)
+{
+        if (!sta)
+                return NULL;
+
+        if (unicast)
+                return &sta->wcid;
+        else
+                return &sta->vif->group_wcid;
+}
+
 #endif
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c b/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c
index c98ce1582aec..93bf8a9404b1 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/mac.c
@@ -64,34 +64,6 @@ int mt76x2_mac_get_rssi(struct mt76x2_dev *dev, s8 rssi, int chain)
         return rssi;
 }
 
-static struct mt76x02_sta *
-mt76x2_rx_get_sta(struct mt76x2_dev *dev, u8 idx)
-{
-        struct mt76_wcid *wcid;
-
-        if (idx >= ARRAY_SIZE(dev->mt76.wcid))
-                return NULL;
-
-        wcid = rcu_dereference(dev->mt76.wcid[idx]);
-        if (!wcid)
-                return NULL;
-
-        return container_of(wcid, struct mt76x02_sta, wcid);
-}
-
-static struct mt76_wcid *
-mt76x2_rx_get_sta_wcid(struct mt76x2_dev *dev, struct mt76x02_sta *sta,
-                       bool unicast)
-{
-        if (!sta)
-                return NULL;
-
-        if (unicast)
-                return &sta->wcid;
-        else
-                return &sta->vif->group_wcid;
-}
-
 int mt76x2_mac_process_rx(struct mt76x2_dev *dev, struct sk_buff *skb,
                           void *rxi)
 {
@@ -122,8 +94,8 @@ int mt76x2_mac_process_rx(struct mt76x2_dev *dev, struct sk_buff *skb,
         }
 
         wcid = FIELD_GET(MT_RXWI_CTL_WCID, ctl);
-        sta = mt76x2_rx_get_sta(dev, wcid);
-        status->wcid = mt76x2_rx_get_sta_wcid(dev, sta, unicast);
+        sta = mt76x02_rx_get_sta(&dev->mt76, wcid);
+        status->wcid = mt76x02_rx_get_sta_wcid(sta, unicast);
 
         len = FIELD_GET(MT_RXWI_CTL_MPDU_LEN, ctl);
         pn_len = FIELD_GET(MT_RXINFO_PN_LEN, rxinfo);