Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mt76: move mt76x02_sw_scan and mt76x02_sw_scan_complete in mt76x02-lib module 



Move mt76x02_sw_scan and mt76x02_sw_scan_complete utility routines
in mt76x02_util.c in order to be reused by mt76x0 and mt76x2u drivers
and remove duplicated code

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 82b5c239

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

+0 −18
Original line number Diff line number Diff line
@@ -127,24 +127,6 @@ void mt76x0_bss_info_changed(struct ieee80211_hw *hw, 
}

EXPORT_SYMBOL_GPL(mt76x0_bss_info_changed);



void mt76x0_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		    const u8 *mac_addr)

{

	struct mt76x02_dev *dev = hw->priv;



	set_bit(MT76_SCANNING, &dev->mt76.state);

}

EXPORT_SYMBOL_GPL(mt76x0_sw_scan);



void mt76x0_sw_scan_complete(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif)

{

	struct mt76x02_dev *dev = hw->priv;



	clear_bit(MT76_SCANNING, &dev->mt76.state);

}

EXPORT_SYMBOL_GPL(mt76x0_sw_scan_complete);



int mt76x0_set_rts_threshold(struct ieee80211_hw *hw, u32 value)

{

	struct mt76x02_dev *dev = hw->priv;

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

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

void mt76x0_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		    const u8 *mac_addr);

void mt76x0_sw_scan_complete(struct ieee80211_hw *hw,

			     struct ieee80211_vif *vif);

int mt76x0_set_rts_threshold(struct ieee80211_hw *hw, u32 value);



/* PHY */

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

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ static const struct ieee80211_ops mt76x0e_ops = { 
	.sta_remove = mt76x02_sta_remove,

	.set_key = mt76x02_set_key,

	.conf_tx = mt76x02_conf_tx,

	.sw_scan_start = mt76x0_sw_scan,

	.sw_scan_complete = mt76x0_sw_scan_complete,

	.sw_scan_start = mt76x02_sw_scan,

	.sw_scan_complete = mt76x02_sw_scan_complete,

	.ampdu_action = mt76x02_ampdu_action,

	.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

	.wake_tx_queue = mt76_wake_tx_queue,

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

+2 −2
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ static const struct ieee80211_ops mt76x0u_ops = { 
	.sta_remove = mt76x02_sta_remove,

	.set_key = mt76x02_set_key,

	.conf_tx = mt76x02_conf_tx,

	.sw_scan_start = mt76x0_sw_scan,

	.sw_scan_complete = mt76x0_sw_scan_complete,

	.sw_scan_start = mt76x02_sw_scan,

	.sw_scan_complete = mt76x02_sw_scan_complete,

	.ampdu_action = mt76x02_ampdu_action,

	.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

	.set_rts_threshold = mt76x0_set_rts_threshold,

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

+4 −0
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi, 
			   struct sk_buff *skb, struct mt76_queue *q,

			   struct mt76_wcid *wcid, struct ieee80211_sta *sta,

			   u32 *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);



extern const u16 mt76x02_beacon_offsets[16];

void mt76x02_set_beacon_offsets(struct mt76x02_dev *dev);