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

mt76: mt7921: move mt7921_usb_sdio_tx_status_data in mac common code. 



This is a preliminary patch to add mt7921u driver support.

Tested-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 9da47b50

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

+12 −0
Original line number Diff line number Diff line
@@ -1701,3 +1701,15 @@ void mt7921_usb_sdio_tx_complete_skb(struct mt76_dev *mdev, 
	mt76_tx_complete_skb(mdev, e->wcid, e->skb);

}

EXPORT_SYMBOL_GPL(mt7921_usb_sdio_tx_complete_skb);



bool mt7921_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update)

{

	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);



	mt7921_mutex_acquire(dev);

	mt7921_mac_sta_poll(dev);

	mt7921_mutex_release(dev);



	return false;

}

EXPORT_SYMBOL_GPL(mt7921_usb_sdio_tx_status_data);

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

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ int mt7921e_mcu_fw_pmctrl(struct mt7921_dev *dev); 
int mt7921s_mcu_init(struct mt7921_dev *dev);

int mt7921s_mcu_drv_pmctrl(struct mt7921_dev *dev);

int mt7921s_mcu_fw_pmctrl(struct mt7921_dev *dev);

bool mt7921s_tx_status_data(struct mt76_dev *mdev, u8 *update);

void mt7921_mac_add_txs(struct mt7921_dev *dev, void *data);

void mt7921_set_runtime_pm(struct mt7921_dev *dev);

int mt7921_mcu_set_sniffer(struct mt7921_dev *dev, struct ieee80211_vif *vif,
@@ -456,4 +455,5 @@ int mt7921_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
				   struct mt76_tx_info *tx_info);

void mt7921_usb_sdio_tx_complete_skb(struct mt76_dev *mdev,

				     struct mt76_queue_entry *e);

bool mt7921_usb_sdio_tx_status_data(struct mt76_dev *mdev, u8 *update);

#endif

drivers/net/wireless/mediatek/mt76/mt7921/sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static int mt7921s_probe(struct sdio_func *func, 
				SURVEY_INFO_TIME_BSS_RX,

		.tx_prepare_skb = mt7921_usb_sdio_tx_prepare_skb,

		.tx_complete_skb = mt7921_usb_sdio_tx_complete_skb,

		.tx_status_data = mt7921s_tx_status_data,

		.tx_status_data = mt7921_usb_sdio_tx_status_data,

		.rx_skb = mt7921_queue_rx_skb,

		.sta_ps = mt7921_sta_ps,

		.sta_add = mt7921_mac_sta_add,

drivers/net/wireless/mediatek/mt76/mt7921/sdio_mac.c

+0 −11
Original line number Diff line number Diff line
@@ -140,14 +140,3 @@ int mt7921s_mac_reset(struct mt7921_dev *dev) 


	return err;

}
 


bool mt7921s_tx_status_data(struct mt76_dev *mdev, u8 *update)

{

	struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76);



	mt7921_mutex_acquire(dev);

	mt7921_mac_sta_poll(dev);

	mt7921_mutex_release(dev);



	return false;

}