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

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

drivers/net/wireless/mediatek/mt76/mac80211.c

+17 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt76.h

+4 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt7603/main.c

+2 −19
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/mediatek/mt76/mt7615/main.c

+2 −19
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE