mt76: add default implementation for mt76_sw_scan/mt76_sw_scan_complete

Introduce a default implementation for mt76_sw_scan and
mt76_sw_scan_complete in mt76 module and remove duplicated code
since most of the drivers share the same implementation

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

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 20bb4b23d27fe1f1ec27aa93db63612f91ed28b0..aeb535204c4d0c340ac6d2a4f4fed611a598a210 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -872,3 +872,20 @@ int mt76_get_rate(struct mt76_dev *dev,
        return 0;
 }
 EXPORT_SYMBOL_GPL(mt76_get_rate);
+
+void mt76_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                 const u8 *mac)
+{
+       struct mt76_dev *dev = hw->priv;
+
+       set_bit(MT76_SCANNING, &dev->state);
+}
+EXPORT_SYMBOL_GPL(mt76_sw_scan);
+
+void mt76_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
+{
+       struct mt76_dev *dev = hw->priv;
+
+       clear_bit(MT76_SCANNING, &dev->state);
+}
+EXPORT_SYMBOL_GPL(mt76_sw_scan_complete);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 714b1dbbb624c83a22f855bd71db70f347243ae9..38f2b17581efc39e058ebc460e2c2eff8e679787 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -765,6 +765,10 @@ void mt76_insert_ccmp_hdr(struct sk_buff *skb, u8 key_id);
 int mt76_get_rate(struct mt76_dev *dev,
                  struct ieee80211_supported_band *sband,
                  int idx, bool cck);
+void mt76_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                 const u8 *mac);
+void mt76_sw_scan_complete(struct ieee80211_hw *hw,
+                          struct ieee80211_vif *vif);
 
 /* internal */
 void mt76_tx_free(struct mt76_dev *dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
index 7adf2f8cd2b044b159b07f46ce7ff22a0153c962..e35c1e4da7eac79be1cdee438d04731a2500bf93 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
@@ -536,23 +536,6 @@ mt7603_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
        return 0;
 }
 
-static void
-mt7603_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-              const u8 *mac)
-{
-       struct mt7603_dev *dev = hw->priv;
-
-       set_bit(MT76_SCANNING, &dev->mt76.state);
-}
-
-static void
-mt7603_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-{
-       struct mt7603_dev *dev = hw->priv;
-
-       clear_bit(MT76_SCANNING, &dev->mt76.state);
-}
-
 static void
 mt7603_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
             u32 queues, bool drop)
@@ -683,8 +666,8 @@ const struct ieee80211_ops mt7603_ops = {
        .sta_state = mt76_sta_state,
        .set_key = mt7603_set_key,
        .conf_tx = mt7603_conf_tx,
-       .sw_scan_start = mt7603_sw_scan,
-       .sw_scan_complete = mt7603_sw_scan_complete,
+       .sw_scan_start = mt76_sw_scan,
+       .sw_scan_complete = mt76_sw_scan_complete,
        .flush = mt7603_flush,
        .ampdu_action = mt7603_ampdu_action,
        .get_txpower = mt76_get_txpower,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 0b833c7a21d4a9c0bb86b3a2cb6865cf97049584..e2a84f717051dc84eaed1b2046539a0495f70937 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -490,23 +490,6 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
        return 0;
 }
 
-static void
-mt7615_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-              const u8 *mac)
-{
-       struct mt7615_dev *dev = hw->priv;
-
-       set_bit(MT76_SCANNING, &dev->mt76.state);
-}
-
-static void
-mt7615_sw_scan_complete(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-{
-       struct mt7615_dev *dev = hw->priv;
-
-       clear_bit(MT76_SCANNING, &dev->mt76.state);
-}
-
 const struct ieee80211_ops mt7615_ops = {
        .tx = mt7615_tx,
        .start = mt7615_start,
@@ -523,8 +506,8 @@ const struct ieee80211_ops mt7615_ops = {
        .set_rts_threshold = mt7615_set_rts_threshold,
        .wake_tx_queue = mt76_wake_tx_queue,
        .sta_rate_tbl_update = mt7615_sta_rate_tbl_update,
-       .sw_scan_start = mt7615_sw_scan,
-       .sw_scan_complete = mt7615_sw_scan_complete,
+       .sw_scan_start = mt76_sw_scan,
+       .sw_scan_complete = mt76_sw_scan_complete,
        .release_buffered_frames = mt76_release_buffered_frames,
        .get_txpower = mt76_get_txpower,
        .channel_switch_beacon = mt7615_channel_switch_beacon,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
index b2ff1fd20162965062c02e598200d1de1df1d923..f84a7df296ea7b209dabc5091ac0610a559d3094 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
@@ -69,7 +69,7 @@ static const struct ieee80211_ops mt76x0e_ops = {
        .sta_state = mt76_sta_state,
        .set_key = mt76x02_set_key,
        .conf_tx = mt76x02_conf_tx,
-       .sw_scan_start = mt76x02_sw_scan,
+       .sw_scan_start = mt76_sw_scan,
        .sw_scan_complete = mt76x02_sw_scan_complete,
        .ampdu_action = mt76x02_ampdu_action,
        .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
index d2d9218810264dde04c937a745495d8980d42b1e..00a445d27599870cb0587ffddccbf8f75cbcb5bf 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
@@ -128,7 +128,7 @@ static const struct ieee80211_ops mt76x0u_ops = {
        .sta_state = mt76_sta_state,
        .set_key = mt76x02_set_key,
        .conf_tx = mt76x02_conf_tx,
-       .sw_scan_start = mt76x02_sw_scan,
+       .sw_scan_start = mt76_sw_scan,
        .sw_scan_complete = mt76x02_sw_scan_complete,
        .ampdu_action = mt76x02_ampdu_action,
        .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index 56a6110f5bbbb9ecf292bd33b92847c89254ba3c..e858bba8c8ffdeba84796ca634177734c8fcb7ca 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -177,8 +177,6 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
                           enum mt76_txq_id qid, struct mt76_wcid *wcid,
                           struct ieee80211_sta *sta,
                           struct mt76_tx_info *tx_info);
-void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                    const u8 *mac);
 void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif);
 void mt76x02_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index 81d98030fc7a29ab7127d920b3a48b5b18569b57..dbd9d99225ff144949478b0c8838d6f22ff1c8e0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -603,15 +603,6 @@ void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len)
 }
 EXPORT_SYMBOL_GPL(mt76x02_remove_hdr_pad);
 
-void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                    const u8 *mac)
-{
-       struct mt76x02_dev *dev = hw->priv;
-
-       set_bit(MT76_SCANNING, &dev->mt76.state);
-}
-EXPORT_SYMBOL_GPL(mt76x02_sw_scan);
-
 void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
index 3921d965a1064ee18cc52e476a801ec495446f66..4971685aafe80ce35a5d8a2107eb9f2dd1aa266e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
@@ -165,7 +165,7 @@ const struct ieee80211_ops mt76x2_ops = {
        .sta_state = mt76_sta_state,
        .set_key = mt76x02_set_key,
        .conf_tx = mt76x02_conf_tx,
-       .sw_scan_start = mt76x02_sw_scan,
+       .sw_scan_start = mt76_sw_scan,
        .sw_scan_complete = mt76x02_sw_scan_complete,
        .flush = mt76x2_flush,
        .ampdu_action = mt76x02_ampdu_action,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
index 1b692fba5a891f8baac6e8a0bcfbd3a2e4af704b..eb73cb856c81306051d766f311b108bcf018788e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
@@ -114,7 +114,7 @@ const struct ieee80211_ops mt76x2u_ops = {
        .bss_info_changed = mt76x02_bss_info_changed,
        .configure_filter = mt76x02_configure_filter,
        .conf_tx = mt76x02_conf_tx,
-       .sw_scan_start = mt76x02_sw_scan,
+       .sw_scan_start = mt76_sw_scan,
        .sw_scan_complete = mt76x02_sw_scan_complete,
        .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,
        .get_txpower = mt76_get_txpower,