Skip to content

L
linux
Commit 8b8ab5c2 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files
Options

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: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 13381dcd
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 53 deletions
drivers/net/wireless/mediatek/mt76/mac80211.c
View file @ 8b8ab5c2
...@@ -872,3 +872,20 @@ int mt76_get_rate(struct mt76_dev *dev, ...@@ -872,3 +872,20 @@ int mt76_get_rate(struct mt76_dev *dev,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(mt76_get_rate); 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);
drivers/net/wireless/mediatek/mt76/mt76.h
View file @ 8b8ab5c2
...@@ -765,6 +765,10 @@ void mt76_insert_ccmp_hdr(struct sk_buff *skb, u8 key_id); ...@@ -765,6 +765,10 @@ void mt76_insert_ccmp_hdr(struct sk_buff *skb, u8 key_id);
int mt76_get_rate(struct mt76_dev *dev, int mt76_get_rate(struct mt76_dev *dev,
struct ieee80211_supported_band *sband, struct ieee80211_supported_band *sband,
int idx, bool cck); 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 */ /* internal */
void mt76_tx_free(struct mt76_dev *dev); void mt76_tx_free(struct mt76_dev *dev);
......
drivers/net/wireless/mediatek/mt76/mt7603/main.c
View file @ 8b8ab5c2
...@@ -536,23 +536,6 @@ mt7603_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue, ...@@ -536,23 +536,6 @@ mt7603_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
return 0; 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 static void
mt7603_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, mt7603_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
u32 queues, bool drop) u32 queues, bool drop)
...@@ -683,8 +666,8 @@ const struct ieee80211_ops mt7603_ops = { ...@@ -683,8 +666,8 @@ const struct ieee80211_ops mt7603_ops = {
.sta_state = mt76_sta_state, .sta_state = mt76_sta_state,
.set_key = mt7603_set_key, .set_key = mt7603_set_key,
.conf_tx = mt7603_conf_tx, .conf_tx = mt7603_conf_tx,
.sw_scan_start = mt7603_sw_scan, .sw_scan_start = mt76_sw_scan,
.sw_scan_complete = mt7603_sw_scan_complete, .sw_scan_complete = mt76_sw_scan_complete,
.flush = mt7603_flush, .flush = mt7603_flush,
.ampdu_action = mt7603_ampdu_action, .ampdu_action = mt7603_ampdu_action,
.get_txpower = mt76_get_txpower, .get_txpower = mt76_get_txpower,
......
drivers/net/wireless/mediatek/mt76/mt7615/main.c
View file @ 8b8ab5c2
...@@ -490,23 +490,6 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, ...@@ -490,23 +490,6 @@ mt7615_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
return 0; 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 = { const struct ieee80211_ops mt7615_ops = {
.tx = mt7615_tx, .tx = mt7615_tx,
.start = mt7615_start, .start = mt7615_start,
...@@ -523,8 +506,8 @@ const struct ieee80211_ops mt7615_ops = { ...@@ -523,8 +506,8 @@ const struct ieee80211_ops mt7615_ops = {
.set_rts_threshold = mt7615_set_rts_threshold, .set_rts_threshold = mt7615_set_rts_threshold,
.wake_tx_queue = mt76_wake_tx_queue, .wake_tx_queue = mt76_wake_tx_queue,
.sta_rate_tbl_update = mt7615_sta_rate_tbl_update, .sta_rate_tbl_update = mt7615_sta_rate_tbl_update,
.sw_scan_start = mt7615_sw_scan, .sw_scan_start = mt76_sw_scan,
.sw_scan_complete = mt7615_sw_scan_complete, .sw_scan_complete = mt76_sw_scan_complete,
.release_buffered_frames = mt76_release_buffered_frames, .release_buffered_frames = mt76_release_buffered_frames,
.get_txpower = mt76_get_txpower, .get_txpower = mt76_get_txpower,
.channel_switch_beacon = mt7615_channel_switch_beacon, .channel_switch_beacon = mt7615_channel_switch_beacon,
......
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
View file @ 8b8ab5c2
...@@ -69,7 +69,7 @@ static const struct ieee80211_ops mt76x0e_ops = { ...@@ -69,7 +69,7 @@ static const struct ieee80211_ops mt76x0e_ops = {
.sta_state = mt76_sta_state, .sta_state = mt76_sta_state,
.set_key = mt76x02_set_key, .set_key = mt76x02_set_key,
.conf_tx = mt76x02_conf_tx, .conf_tx = mt76x02_conf_tx,
.sw_scan_start = mt76x02_sw_scan, .sw_scan_start = mt76_sw_scan,
.sw_scan_complete = mt76x02_sw_scan_complete, .sw_scan_complete = mt76x02_sw_scan_complete,
.ampdu_action = mt76x02_ampdu_action, .ampdu_action = mt76x02_ampdu_action,
.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update, .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,
......
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c
View file @ 8b8ab5c2
...@@ -128,7 +128,7 @@ static const struct ieee80211_ops mt76x0u_ops = { ...@@ -128,7 +128,7 @@ static const struct ieee80211_ops mt76x0u_ops = {
.sta_state = mt76_sta_state, .sta_state = mt76_sta_state,
.set_key = mt76x02_set_key, .set_key = mt76x02_set_key,
.conf_tx = mt76x02_conf_tx, .conf_tx = mt76x02_conf_tx,
.sw_scan_start = mt76x02_sw_scan, .sw_scan_start = mt76_sw_scan,
.sw_scan_complete = mt76x02_sw_scan_complete, .sw_scan_complete = mt76x02_sw_scan_complete,
.ampdu_action = mt76x02_ampdu_action, .ampdu_action = mt76x02_ampdu_action,
.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update, .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,
......
drivers/net/wireless/mediatek/mt76/mt76x02.h
View file @ 8b8ab5c2
...@@ -177,8 +177,6 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi, ...@@ -177,8 +177,6 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
enum mt76_txq_id qid, struct mt76_wcid *wcid, enum mt76_txq_id qid, struct mt76_wcid *wcid,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
struct mt76_tx_info *tx_info); 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, void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,
struct ieee80211_vif *vif); struct ieee80211_vif *vif);
void mt76x02_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps); void mt76x02_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps);
......
drivers/net/wireless/mediatek/mt76/mt76x02_util.c
View file @ 8b8ab5c2
...@@ -603,15 +603,6 @@ void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len) ...@@ -603,15 +603,6 @@ void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len)
} }
EXPORT_SYMBOL_GPL(mt76x02_remove_hdr_pad); 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, void mt76x02_sw_scan_complete(struct ieee80211_hw *hw,
struct ieee80211_vif *vif) struct ieee80211_vif *vif)
{ {
......
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c
View file @ 8b8ab5c2
...@@ -165,7 +165,7 @@ const struct ieee80211_ops mt76x2_ops = { ...@@ -165,7 +165,7 @@ const struct ieee80211_ops mt76x2_ops = {
.sta_state = mt76_sta_state, .sta_state = mt76_sta_state,
.set_key = mt76x02_set_key, .set_key = mt76x02_set_key,
.conf_tx = mt76x02_conf_tx, .conf_tx = mt76x02_conf_tx,
.sw_scan_start = mt76x02_sw_scan, .sw_scan_start = mt76_sw_scan,
.sw_scan_complete = mt76x02_sw_scan_complete, .sw_scan_complete = mt76x02_sw_scan_complete,
.flush = mt76x2_flush, .flush = mt76x2_flush,
.ampdu_action = mt76x02_ampdu_action, .ampdu_action = mt76x02_ampdu_action,
......
drivers/net/wireless/mediatek/mt76/mt76x2/usb_main.c
View file @ 8b8ab5c2
...@@ -114,7 +114,7 @@ const struct ieee80211_ops mt76x2u_ops = { ...@@ -114,7 +114,7 @@ const struct ieee80211_ops mt76x2u_ops = {
.bss_info_changed = mt76x02_bss_info_changed, .bss_info_changed = mt76x02_bss_info_changed,
.configure_filter = mt76x02_configure_filter, .configure_filter = mt76x02_configure_filter,
.conf_tx = mt76x02_conf_tx, .conf_tx = mt76x02_conf_tx,
.sw_scan_start = mt76x02_sw_scan, .sw_scan_start = mt76_sw_scan,
.sw_scan_complete = mt76x02_sw_scan_complete, .sw_scan_complete = mt76x02_sw_scan_complete,
.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update, .sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,
.get_txpower = mt76_get_txpower, .get_txpower = mt76_get_txpower,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7