mt76: connac: move mt76_connac_mcu_bss_basic_tlv in connac module

Move mt7615_mcu_bss_basic_tlv/mt7915_mcu_bss_basic_tlv in connac
module since it is shared between mt7615 and mt7915 drivers.

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 40b8cdc..3bec99f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -785,58 +785,6 @@ mt7615_mcu_ctrl_pm_state(struct mt7615_dev *dev, int band, int state)
 }
 
 static int
-mt7615_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
-                        struct ieee80211_sta *sta, struct mt7615_phy *phy,
-                        bool enable)
-{
-       struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;
-       u32 type = vif->p2p ? NETWORK_P2P : NETWORK_INFRA;
-       struct bss_info_basic *bss;
-       u8 wlan_idx = mvif->sta.wcid.idx;
-       struct tlv *tlv;
-
-       tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_BASIC, sizeof(*bss));
-
-       switch (vif->type) {
-       case NL80211_IFTYPE_MESH_POINT:
-       case NL80211_IFTYPE_AP:
-       case NL80211_IFTYPE_MONITOR:
-               break;
-       case NL80211_IFTYPE_STATION:
-               /* TODO: enable BSS_INFO_UAPSD & BSS_INFO_PM */
-               if (enable && sta) {
-                       struct mt7615_sta *msta;
-
-                       msta = (struct mt7615_sta *)sta->drv_priv;
-                       wlan_idx = msta->wcid.idx;
-               }
-               break;
-       case NL80211_IFTYPE_ADHOC:
-               type = NETWORK_IBSS;
-               break;
-       default:
-               WARN_ON(1);
-               break;
-       }
-
-       bss = (struct bss_info_basic *)tlv;
-       bss->network_type = cpu_to_le32(type);
-       bss->bmc_wcid_lo = wlan_idx;
-       bss->wmm_idx = mvif->mt76.wmm_idx;
-       bss->active = enable;
-
-       if (vif->type != NL80211_IFTYPE_MONITOR) {
-               memcpy(bss->bssid, vif->bss_conf.bssid, ETH_ALEN);
-               bss->bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int);
-               bss->dtim_period = vif->bss_conf.dtim_period;
-       } else {
-               memcpy(bss->bssid, phy->mt76->macaddr, ETH_ALEN);
-       }
-
-       return 0;
-}
-
-static int
 mt7615_mcu_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif,
                   struct ieee80211_sta *sta, bool enable)
 {
@@ -854,7 +802,8 @@ mt7615_mcu_add_bss(struct mt7615_phy *phy, struct ieee80211_vif *vif,
        if (enable)
                mt76_connac_mcu_bss_omac_tlv(skb, vif);
 
-       mt7615_mcu_bss_basic_tlv(skb, vif, sta, phy, enable);
+       mt76_connac_mcu_bss_basic_tlv(skb, vif, sta, phy->mt76,
+                                     mvif->sta.wcid.idx, enable);
 
        if (enable && mvif->mt76.omac_idx >= EXT_BSSID_START &&
            mvif->mt76.omac_idx < REPEATER_BSSID_START)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 93c5e4d..7788f00 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2632,5 +2632,70 @@ void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif *mvif)
 }
 EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_ext_tlv);
 
+int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
+                                 struct ieee80211_vif *vif,
+                                 struct ieee80211_sta *sta,
+                                 struct mt76_phy *phy, u8 wlan_idx,
+                                 bool enable)
+{
+       struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
+       u32 type = vif->p2p ? NETWORK_P2P : NETWORK_INFRA;
+       struct bss_info_basic *bss;
+       struct tlv *tlv;
+
+       switch (vif->type) {
+       case NL80211_IFTYPE_MESH_POINT:
+       case NL80211_IFTYPE_AP:
+       case NL80211_IFTYPE_MONITOR:
+               break;
+       case NL80211_IFTYPE_STATION:
+               if (enable) {
+                       rcu_read_lock();
+                       if (!sta)
+                               sta = ieee80211_find_sta(vif,
+                                                        vif->bss_conf.bssid);
+                       /* TODO: enable BSS_INFO_UAPSD & BSS_INFO_PM */
+                       if (sta) {
+                               struct mt76_wcid *wcid;
+
+                               wcid = (struct mt76_wcid *)sta->drv_priv;
+                               wlan_idx = wcid->idx;
+                       }
+                       rcu_read_unlock();
+               }
+               break;
+       case NL80211_IFTYPE_ADHOC:
+               type = NETWORK_IBSS;
+               break;
+       default:
+               WARN_ON(1);
+               break;
+       }
+
+       tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_BASIC, sizeof(*bss));
+
+       bss = (struct bss_info_basic *)tlv;
+       bss->network_type = cpu_to_le32(type);
+       bss->bmc_wcid_lo = to_wcid_lo(wlan_idx);
+       bss->bmc_wcid_hi = to_wcid_hi(wlan_idx);
+       bss->wmm_idx = mvif->wmm_idx;
+       bss->active = enable;
+
+       if (vif->type != NL80211_IFTYPE_MONITOR) {
+               struct cfg80211_chan_def *chandef = &phy->chandef;
+
+               memcpy(bss->bssid, vif->bss_conf.bssid, ETH_ALEN);
+               bss->bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int);
+               bss->dtim_period = vif->bss_conf.dtim_period;
+               bss->phy_mode = mt76_connac_get_phy_mode(phy, vif,
+                                                        chandef->chan->band, NULL);
+       } else {
+               memcpy(bss->bssid, phy->macaddr, ETH_ALEN);
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(mt76_connac_mcu_bss_basic_tlv);
+
 MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");
 MODULE_LICENSE("Dual BSD/GPL");

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 84ab91d..ccae578 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1596,4 +1596,9 @@ int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,
 void mt76_connac_mcu_bss_ext_tlv(struct sk_buff *skb, struct mt76_vif *mvif);
 void mt76_connac_mcu_bss_omac_tlv(struct sk_buff *skb,
                                  struct ieee80211_vif *vif);
+int mt76_connac_mcu_bss_basic_tlv(struct sk_buff *skb,
+                                 struct ieee80211_vif *vif,
+                                 struct ieee80211_sta *sta,
+                                 struct mt76_phy *phy, u8 wlan_idx,
+                                 bool enable);
 #endif /* __MT76_CONNAC_MCU_H */

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 32a4611..4fb7bc8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -487,71 +487,6 @@ mt7915_mcu_add_nested_subtlv(struct sk_buff *skb, int sub_tag, int sub_len,
 }
 
 /** bss info **/
-static int
-mt7915_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
-                        struct mt7915_phy *phy, bool enable)
-{
-       struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv;
-       struct bss_info_basic *bss;
-       u16 wlan_idx = mvif->sta.wcid.idx;
-       u32 type = NETWORK_INFRA;
-       struct tlv *tlv;
-
-       tlv = mt76_connac_mcu_add_tlv(skb, BSS_INFO_BASIC, sizeof(*bss));
-
-       switch (vif->type) {
-       case NL80211_IFTYPE_MESH_POINT:
-       case NL80211_IFTYPE_AP:
-       case NL80211_IFTYPE_MONITOR:
-               break;
-       case NL80211_IFTYPE_STATION:
-               /* TODO: enable BSS_INFO_UAPSD & BSS_INFO_PM */
-               if (enable) {
-                       struct ieee80211_sta *sta;
-                       struct mt7915_sta *msta;
-
-                       rcu_read_lock();
-                       sta = ieee80211_find_sta(vif, vif->bss_conf.bssid);
-                       if (!sta) {
-                               rcu_read_unlock();
-                               return -EINVAL;
-                       }
-
-                       msta = (struct mt7915_sta *)sta->drv_priv;
-                       wlan_idx = msta->wcid.idx;
-                       rcu_read_unlock();
-               }
-               break;
-       case NL80211_IFTYPE_ADHOC:
-               type = NETWORK_IBSS;
-               break;
-       default:
-               WARN_ON(1);
-               break;
-       }
-
-       bss = (struct bss_info_basic *)tlv;
-       bss->network_type = cpu_to_le32(type);
-       bss->bmc_wcid_lo = to_wcid_lo(wlan_idx);
-       bss->bmc_wcid_hi = to_wcid_hi(wlan_idx);
-       bss->wmm_idx = mvif->mt76.wmm_idx;
-       bss->active = enable;
-
-       if (vif->type != NL80211_IFTYPE_MONITOR) {
-               struct cfg80211_chan_def *chandef = &phy->mt76->chandef;
-
-               memcpy(bss->bssid, vif->bss_conf.bssid, ETH_ALEN);
-               bss->bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int);
-               bss->dtim_period = vif->bss_conf.dtim_period;
-               bss->phy_mode = mt76_connac_get_phy_mode(phy->mt76, vif,
-                                                        chandef->chan->band, NULL);
-       } else {
-               memcpy(bss->bssid, phy->mt76->macaddr, ETH_ALEN);
-       }
-
-       return 0;
-}
-
 struct mt7915_he_obss_narrow_bw_ru_data {
        bool tolerated;
 };
@@ -782,7 +717,8 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,
        if (enable)
                mt76_connac_mcu_bss_omac_tlv(skb, vif);
 
-       mt7915_mcu_bss_basic_tlv(skb, vif, phy, enable);
+       mt76_connac_mcu_bss_basic_tlv(skb, vif, NULL, phy->mt76,
+                                     mvif->sta.wcid.idx, enable);
 
        if (vif->type == NL80211_IFTYPE_MONITOR)
                goto out;