mt76: move mt76x02_bss_info_changed in mt76x02-lib module

Unify drv_bss_info_changed mac80211 callback and remove duplicated
code in mt76x0 and mt76x2 drivers

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/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
index b8eba511d0f3cbb721596659a178957bbb27415d..cd1a1225ad8bb6d1c7363c877125117c5641b93b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
@@ -71,52 +71,3 @@ int mt76x0_config(struct ieee80211_hw *hw, u32 changed)
        return ret;
 }
 EXPORT_SYMBOL_GPL(mt76x0_config);
-
-void mt76x0_bss_info_changed(struct ieee80211_hw *hw,
-                            struct ieee80211_vif *vif,
-                            struct ieee80211_bss_conf *info, u32 changed)
-{
-       struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
-       struct mt76x02_dev *dev = hw->priv;
-
-       mutex_lock(&dev->mt76.mutex);
-
-       if (changed & BSS_CHANGED_BSSID)
-               mt76x02_mac_set_bssid(dev, mvif->idx, info->bssid);
-
-       if (changed & BSS_CHANGED_BEACON_ENABLED) {
-               tasklet_disable(&dev->pre_tbtt_tasklet);
-               mt76x02_mac_set_beacon_enable(dev, mvif->idx,
-                                             info->enable_beacon);
-               tasklet_enable(&dev->pre_tbtt_tasklet);
-       }
-
-       if (changed & BSS_CHANGED_BASIC_RATES) {
-               mt76_wr(dev, MT_LEGACY_BASIC_RATE, info->basic_rates);
-               mt76_wr(dev, MT_VHT_HT_FBK_CFG0, 0x65432100);
-               mt76_wr(dev, MT_VHT_HT_FBK_CFG1, 0xedcba980);
-               mt76_wr(dev, MT_LG_FBK_CFG0, 0xedcba988);
-               mt76_wr(dev, MT_LG_FBK_CFG1, 0x00002100);
-       }
-
-       if (changed & BSS_CHANGED_BEACON_INT) {
-               mt76_rmw_field(dev, MT_BEACON_TIME_CFG,
-                              MT_BEACON_TIME_CFG_INTVAL,
-                              info->beacon_int << 4);
-               dev->beacon_int = info->beacon_int;
-               dev->tbtt_count = 0;
-       }
-
-       if (changed & BSS_CHANGED_ERP_PREAMBLE)
-               mt76x02_mac_set_short_preamble(dev, info->use_short_preamble);
-
-       if (changed & BSS_CHANGED_ERP_SLOT) {
-               int slottime = info->use_short_slot ? 9 : 20;
-
-               dev->slottime = slottime;
-               mt76x02_set_tx_ackto(dev);
-       }
-
-       mutex_unlock(&dev->mt76.mutex);
-}
-EXPORT_SYMBOL_GPL(mt76x0_bss_info_changed);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
index 14ca5937ed97b6d54d4ce11dfa36e7e48c5e191f..46629f61673bd57aaecca464ff209ca685b58672 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
@@ -62,9 +62,6 @@ int mt76x0_mac_start(struct mt76x02_dev *dev);
 void mt76x0_mac_stop(struct mt76x02_dev *dev);
 
 int mt76x0_config(struct ieee80211_hw *hw, u32 changed);
-void mt76x0_bss_info_changed(struct ieee80211_hw *hw,
-                            struct ieee80211_vif *vif,
-                            struct ieee80211_bss_conf *info, u32 changed);
 
 /* PHY */
 void mt76x0_phy_init(struct mt76x02_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index 0a5b499061e9e4a957fb1f8e6cfa472c4e10446a..757816d2b1abccea5a446ff90a28b72899b9f15f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -89,7 +89,7 @@ static const struct ieee80211_ops mt76x0e_ops = {
        .remove_interface = mt76x02_remove_interface,
        .config = mt76x0_config,
        .configure_filter = mt76x02_configure_filter,
-       .bss_info_changed = mt76x0_bss_info_changed,
+       .bss_info_changed = mt76x02_bss_info_changed,
        .sta_add = mt76x02_sta_add,
        .sta_remove = mt76x02_sta_remove,
        .set_key = mt76x02_set_key,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index 690c2e6abaeba1d6c8c0617a17bbcea54ac6ff2e..35b98661632a94e7ff59fb1f7af156456a3216a4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -145,7 +145,7 @@ static const struct ieee80211_ops mt76x0u_ops = {
        .remove_interface = mt76x02_remove_interface,
        .config = mt76x0_config,
        .configure_filter = mt76x02_configure_filter,
-       .bss_info_changed = mt76x0_bss_info_changed,
+       .bss_info_changed = mt76x02_bss_info_changed,
        .sta_add = mt76x02_sta_add,
        .sta_remove = mt76x02_sta_remove,
        .set_key = mt76x02_set_key,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 3b698f0e8b28f43a0f7a2a2cf9493846661d0461..d599b7dddac7be5e0766e5f9b67de5e24dd023b8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -158,6 +158,9 @@ void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,
 int mt76x02_get_txpower(struct ieee80211_hw *hw,
                        struct ieee80211_vif *vif, int *dbm);
 void mt76x02_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps);
+void mt76x02_bss_info_changed(struct ieee80211_hw *hw,
+                             struct ieee80211_vif *vif,
+                             struct ieee80211_bss_conf *info, u32 changed);
 
 extern const u16 mt76x02_beacon_offsets[16];
 void mt76x02_init_beacon_config(struct mt76x02_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index 65eed824d9c80ce0add6f901f5c07459588ec91b..4c3b8392b2b7932a7f72a963071cd8521d821a2c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -647,4 +647,46 @@ void mt76x02_init_beacon_config(struct mt76x02_dev *dev)
 }
 EXPORT_SYMBOL_GPL(mt76x02_init_beacon_config);
 
+void mt76x02_bss_info_changed(struct ieee80211_hw *hw,
+                             struct ieee80211_vif *vif,
+                             struct ieee80211_bss_conf *info,
+                             u32 changed)
+{
+       struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
+       struct mt76x02_dev *dev = hw->priv;
+
+       mutex_lock(&dev->mt76.mutex);
+
+       if (changed & BSS_CHANGED_BSSID)
+               mt76x02_mac_set_bssid(dev, mvif->idx, info->bssid);
+
+       if (changed & BSS_CHANGED_BEACON_ENABLED) {
+               tasklet_disable(&dev->pre_tbtt_tasklet);
+               mt76x02_mac_set_beacon_enable(dev, mvif->idx,
+                                             info->enable_beacon);
+               tasklet_enable(&dev->pre_tbtt_tasklet);
+       }
+
+       if (changed & BSS_CHANGED_BEACON_INT) {
+               mt76_rmw_field(dev, MT_BEACON_TIME_CFG,
+                              MT_BEACON_TIME_CFG_INTVAL,
+                              info->beacon_int << 4);
+               dev->beacon_int = info->beacon_int;
+               dev->tbtt_count = 0;
+       }
+
+       if (changed & BSS_CHANGED_ERP_PREAMBLE)
+               mt76x02_mac_set_short_preamble(dev, info->use_short_preamble);
+
+       if (changed & BSS_CHANGED_ERP_SLOT) {
+               int slottime = info->use_short_slot ? 9 : 20;
+
+               dev->slottime = slottime;
+               mt76x02_set_tx_ackto(dev);
+       }
+
+       mutex_unlock(&dev->mt76.mutex);
+}
+EXPORT_SYMBOL_GPL(mt76x02_bss_info_changed);
+
 MODULE_LICENSE("Dual BSD/GPL");

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
index f1bd36c460369edf88e48198b1f3073daf22b89d..ec585b92d6c0cff8ec0ee666e4d21ce1c40dfa47 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
@@ -127,43 +127,6 @@ mt76x2_config(struct ieee80211_hw *hw, u32 changed)
        return ret;
 }
 
-static void
-mt76x2_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                       struct ieee80211_bss_conf *info, u32 changed)
-{
-       struct mt76x02_dev *dev = hw->priv;
-       struct mt76x02_vif *mvif = (struct mt76x02_vif *) vif->drv_priv;
-
-       mutex_lock(&dev->mt76.mutex);
-
-       if (changed & BSS_CHANGED_BSSID)
-               mt76x02_mac_set_bssid(dev, mvif->idx, info->bssid);
-
-       if (changed & BSS_CHANGED_BEACON_INT) {
-               mt76_rmw_field(dev, MT_BEACON_TIME_CFG,
-                              MT_BEACON_TIME_CFG_INTVAL,
-                              info->beacon_int << 4);
-               dev->beacon_int = info->beacon_int;
-               dev->tbtt_count = 0;
-       }
-
-       if (changed & BSS_CHANGED_BEACON_ENABLED) {
-               tasklet_disable(&dev->pre_tbtt_tasklet);
-               mt76x02_mac_set_beacon_enable(dev, mvif->idx,
-                                             info->enable_beacon);
-               tasklet_enable(&dev->pre_tbtt_tasklet);
-       }
-
-       if (changed & BSS_CHANGED_ERP_SLOT) {
-               int slottime = info->use_short_slot ? 9 : 20;
-
-               dev->slottime = slottime;
-               mt76x02_set_tx_ackto(dev);
-       }
-
-       mutex_unlock(&dev->mt76.mutex);
-}
-
 static void
 mt76x2_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
             u32 queues, bool drop)
@@ -218,7 +181,7 @@ const struct ieee80211_ops mt76x2_ops = {
        .remove_interface = mt76x02_remove_interface,
        .config = mt76x2_config,
        .configure_filter = mt76x02_configure_filter,
-       .bss_info_changed = mt76x2_bss_info_changed,
+       .bss_info_changed = mt76x02_bss_info_changed,
        .sta_add = mt76x02_sta_add,
        .sta_remove = mt76x02_sta_remove,
        .set_key = mt76x02_set_key,