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

mt76: move mt76x2_tx_complete routine in mt76x02-lib module 



Move mt76x2_tx_complete routine in mt76x02-lib module and rename it in
mt76x02_tx_complete in order to be used in mt76x0 driver

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 5a69931c

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

+15 −0
Original line number Diff line number Diff line
@@ -377,4 +377,19 @@ void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len) 
}

EXPORT_SYMBOL_GPL(mt76x02_remove_hdr_pad);



void mt76x02_tx_complete(struct mt76_dev *dev, struct sk_buff *skb)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	if (info->flags & IEEE80211_TX_CTL_AMPDU) {

		ieee80211_free_txskb(dev->hw, skb);

	} else {

		ieee80211_tx_info_clear_status(info);

		info->status.rates[0].idx = -1;

		info->flags |= IEEE80211_TX_STAT_ACK;

		ieee80211_tx_status(dev->hw, skb);

	}

}

EXPORT_SYMBOL_GPL(mt76x02_tx_complete);



MODULE_LICENSE("Dual BSD/GPL");

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

+1 −0
Original line number Diff line number Diff line
@@ -45,4 +45,5 @@ void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw, 
				struct ieee80211_sta *sta);

int mt76x02_insert_hdr_pad(struct sk_buff *skb);

void mt76x02_remove_hdr_pad(struct sk_buff *skb, int len);

void mt76x02_tx_complete(struct mt76_dev *dev, struct sk_buff *skb);

#endif

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

+0 −1
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ int mt76x2_tx_queue_mcu(struct mt76x2_dev *dev, enum mt76_txq_id qid, 
			struct sk_buff *skb, int cmd, int seq);

void mt76x2_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,

	       struct sk_buff *skb);

void mt76x2_tx_complete(struct mt76_dev *dev, struct sk_buff *skb);

int mt76x2_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,

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

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "mt76x2_mcu.h"

#include "mt76x2_eeprom.h"

#include "mt76x2_trace.h"

#include "mt76x02_util.h"



void mt76x2_mac_set_bssid(struct mt76x2_dev *dev, u8 idx, const u8 *addr)

{
@@ -73,7 +74,7 @@ mt76x2_mac_queue_txdone(struct mt76x2_dev *dev, struct sk_buff *skb, 
	txi->wcid = txwi->wcid;

	txi->pktid = txwi->pktid;

	trace_mac_txdone_add(dev, txwi->wcid, txwi->pktid);

	mt76x2_tx_complete(&dev->mt76, skb);

	mt76x02_tx_complete(&dev->mt76, skb);

}



void mt76x2_mac_process_tx_status_fifo(struct mt76x2_dev *dev)

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

+0 −16
Original line number Diff line number Diff line
@@ -116,19 +116,3 @@ void mt76x2_tx_set_txpwr_auto(struct mt76x2_dev *dev, s8 txpwr) 
		       MT_PROT_AUTO_TX_CFG_AUTO_PADJ, txpwr_adj);

}

EXPORT_SYMBOL_GPL(mt76x2_tx_set_txpwr_auto);
 


void mt76x2_tx_complete(struct mt76_dev *dev, struct sk_buff *skb)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	if (info->flags & IEEE80211_TX_CTL_AMPDU) {

		ieee80211_free_txskb(dev->hw, skb);

	} else {

		ieee80211_tx_info_clear_status(info);

		info->status.rates[0].idx = -1;

		info->flags |= IEEE80211_TX_STAT_ACK;

		ieee80211_tx_status(dev->hw, skb);

	}

}

EXPORT_SYMBOL_GPL(mt76x2_tx_complete);

CRA Git | Maintained and supported by SUSTech CRA and CCSE