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

wifi: mt76: mt792x: move mt7921_skb_add_usb_sdio_hdr in mt792x module 



Since mt7921_skb_add_usb_sdio_hdr is shared between mt7925 and mt7921
drivers, move it in mt792x module.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 81af5418

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

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ int mt7921_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
	mt7921_usb_sdio_write_txwi(dev, wcid, qid, sta, key, pktid, skb);



	type = mt76_is_sdio(mdev) ? MT7921_SDIO_DATA : 0;

	mt7921_skb_add_usb_sdio_hdr(dev, skb, type);

	mt792x_skb_add_usb_sdio_hdr(dev, skb, type);

	pad = round_up(skb->len, 4) - skb->len;

	if (mt76_is_usb(mdev))

		pad += 4;

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

+0 −16
Original line number Diff line number Diff line
@@ -23,9 +23,6 @@ 
#define MT7921_SKU_MAX_DELTA_IDX	MT7921_SKU_RATE_NUM

#define MT7921_SKU_TABLE_SIZE		(MT7921_SKU_RATE_NUM + 1)



#define MT7921_SDIO_HDR_TX_BYTES	GENMASK(15, 0)

#define MT7921_SDIO_HDR_PKT_TYPE	GENMASK(17, 16)



#define MCU_UNI_EVENT_ROC  0x27



enum {
@@ -235,19 +232,6 @@ mt7921_l1_rmw(struct mt792x_dev *dev, u32 addr, u32 mask, u32 val) 
#define mt7921_l1_set(dev, addr, val)	mt7921_l1_rmw(dev, addr, 0, val)

#define mt7921_l1_clear(dev, addr, val)	mt7921_l1_rmw(dev, addr, val, 0)



static inline void

mt7921_skb_add_usb_sdio_hdr(struct mt792x_dev *dev, struct sk_buff *skb,

			    int type)

{

	u32 hdr, len;



	len = mt76_is_usb(&dev->mt76) ? skb->len : skb->len + sizeof(hdr);

	hdr = FIELD_PREP(MT7921_SDIO_HDR_TX_BYTES, len) |

	      FIELD_PREP(MT7921_SDIO_HDR_PKT_TYPE, type);



	put_unaligned_le32(hdr, skb_push(skb, sizeof(hdr)));

}



void mt7921_stop(struct ieee80211_hw *hw);

int mt7921_mac_init(struct mt792x_dev *dev);

bool mt7921_mac_wtbl_update(struct mt792x_dev *dev, int idx, u32 mask);

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ mt7921s_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, 
	if (cmd == MCU_CMD(FW_SCATTER))

		type = MT7921_SDIO_FWDL;



	mt7921_skb_add_usb_sdio_hdr(dev, skb, type);

	mt792x_skb_add_usb_sdio_hdr(dev, skb, type);

	pad = round_up(skb->len, 4) - skb->len;

	__skb_put_zero(skb, pad);

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ mt7921u_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, 
	else

		ep = MT_EP_OUT_AC_BE;



	mt7921_skb_add_usb_sdio_hdr(dev, skb, 0);

	mt792x_skb_add_usb_sdio_hdr(dev, skb, 0);

	pad = round_up(skb->len, 4) + 4 - skb->len;

	__skb_put_zero(skb, pad);

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

+1 −1
Original line number Diff line number Diff line
@@ -1378,7 +1378,7 @@ int mt7925_usb_sdio_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
	pktid = mt76_tx_status_skb_add(&dev->mt76, wcid, skb);

	mt7925_usb_sdio_write_txwi(dev, wcid, qid, sta, key, pktid, skb);



	mt7925_skb_add_usb_sdio_hdr(dev, skb, 0);

	mt792x_skb_add_usb_sdio_hdr(dev, skb, 0);

	pad = round_up(skb->len, 4) - skb->len;

	if (mt76_is_usb(mdev))

		pad += 4;