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

Commit bbd89d94 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Kalle Valo
Browse files

mt76x2: add buffer len to mt76x2_mac_write_txwi signature 



Add frame length to mt76x2_mac_write_txwi routine signature and do not
fetch it from skb since txwi data structure is added at the beginning of
the skb for usb based devices and mt76x2_mac_write_txwi will be shared
between pci and usb related code

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 81e850ef

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

+3 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ void mt76x2_mac_wcid_set_rate(struct mt76x2_dev *dev, struct mt76_wcid *wcid, 


void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x2_txwi *txwi,

			   struct sk_buff *skb, struct mt76_wcid *wcid,

			   struct ieee80211_sta *sta)

			   struct ieee80211_sta *sta, int len)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_rate *rate = &info->control.rates[0];
@@ -254,7 +254,7 @@ void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x2_txwi *txwi, 
		txwi_flags |= MT_TXWI_FLAGS_TS;



	txwi->flags |= cpu_to_le16(txwi_flags);

	txwi->len_ctl = cpu_to_le16(skb->len);

	txwi->len_ctl = cpu_to_le16(len);

}



static void mt76x2_remove_hdr_pad(struct sk_buff *skb, int len)
@@ -732,7 +732,7 @@ mt76_write_beacon(struct mt76x2_dev *dev, int offset, struct sk_buff *skb) 
	if (WARN_ON_ONCE(beacon_len < skb->len + sizeof(struct mt76x2_txwi)))

		return -ENOSPC;



	mt76x2_mac_write_txwi(dev, &txwi, skb, NULL, NULL);

	mt76x2_mac_write_txwi(dev, &txwi, skb, NULL, NULL, skb->len);



	mt76_wr_copy(dev, offset, &txwi, sizeof(txwi));

	offset += sizeof(txwi);

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

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ int mt76x2_mac_process_rx(struct mt76x2_dev *dev, struct sk_buff *skb, 
			  void *rxi);

void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x2_txwi *txwi,

			   struct sk_buff *skb, struct mt76_wcid *wcid,

			   struct ieee80211_sta *sta);

			   struct ieee80211_sta *sta, int len);

void mt76x2_mac_wcid_setup(struct mt76x2_dev *dev, u8 idx, u8 vif_idx, u8 *mac);

int mt76x2_mac_wcid_set_key(struct mt76x2_dev *dev, u8 idx,

			    struct ieee80211_key_conf *key);

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

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ int mt76x2_tx_prepare_skb(struct mt76_dev *mdev, void *txwi, 
	if (q == &dev->mt76.q_tx[MT_TXQ_PSD] && wcid && wcid->idx < 128)

		mt76x2_mac_wcid_set_drop(dev, wcid->idx, false);



	mt76x2_mac_write_txwi(dev, txwi, skb, wcid, sta);

	mt76x2_mac_write_txwi(dev, txwi, skb, wcid, sta, skb->len);



	ret = mt76x2_insert_hdr_pad(skb);

	if (ret < 0)