Commit 1d5af0ac authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: do not use skb_set_queue_mapping for internal purposes 



Previously the code used skb_set_queue_mapping for management or non-bufferable
powersave frames that need to be sent to a different hardware queue.
This can confuse AQL, which expects the value to remain the same until the tx
status report.
The only place that currently uses the altered skb queue mapping is the txwi
write function. Change the code to pass the hardware queue id as a function
parameter instead.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent d08295f5

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

+3 −2
Original line number Diff line number Diff line
@@ -717,7 +717,8 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev, 
int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,

			  struct sk_buff *skb, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta, int pid,

			  struct ieee80211_key_conf *key, bool beacon)

			  struct ieee80211_key_conf *key,

			  enum mt76_txq_id qid, bool beacon)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	u8 fc_type, fc_stype, p_fmt, q_idx, omac_idx = 0, wmm_idx = 0;
@@ -755,7 +756,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, 
	if (beacon) {

		p_fmt = MT_TX_TYPE_FW;

		q_idx = ext_phy ? MT_LMAC_BCN1 : MT_LMAC_BCN0;

	} else if (skb_get_queue_mapping(skb) >= MT_TXQ_PSD) {

	} else if (qid >= MT_TXQ_PSD) {

		p_fmt = is_mmio ? MT_TX_TYPE_CT : MT_TX_TYPE_SF;

		q_idx = ext_phy ? MT_LMAC_ALTX1 : MT_LMAC_ALTX0;

	} else {

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+2 −2
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev, 
	}



	mt7615_mac_write_txwi(dev, (__le32 *)(req.pkt), skb, wcid, NULL,

			      0, NULL, true);

			      0, NULL, 0, true);

	memcpy(req.pkt + MT_TXD_SIZE, skb->data, skb->len);

	req.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len);

	req.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);
@@ -1086,7 +1086,7 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev, 
	}



	mt7615_mac_write_txwi(dev, (__le32 *)(req.beacon_tlv.pkt), skb,

			      wcid, NULL, 0, NULL, true);

			      wcid, NULL, 0, NULL, 0, true);

	memcpy(req.beacon_tlv.pkt + MT_TXD_SIZE, skb->data, skb->len);

	req.beacon_tlv.pkt_len = cpu_to_le16(MT_TXD_SIZE + skb->len);

	req.beacon_tlv.tim_ie_pos = cpu_to_le16(MT_TXD_SIZE + offs.tim_offset);

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

+2 −1
Original line number Diff line number Diff line
@@ -477,7 +477,8 @@ void mt7615_mac_sta_poll(struct mt7615_dev *dev); 
int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,

			  struct sk_buff *skb, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta, int pid,

			  struct ieee80211_key_conf *key, bool beacon);

			  struct ieee80211_key_conf *key,

			  enum mt76_txq_id qid, bool beacon);

void mt7615_mac_set_timing(struct mt7615_phy *phy);

int __mt7615_mac_wtbl_set_key(struct mt7615_dev *dev,

			      struct mt76_wcid *wcid,

drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 


	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb);

	mt7615_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, sta,

			      pid, key, false);

			      pid, key, qid, false);



	txp = txwi + MT_TXD_SIZE;

	memset(txp, 0, sizeof(struct mt76_connac_txp_common));

drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ mt7663_usb_sdio_write_txwi(struct mt7615_dev *dev, struct mt76_wcid *wcid, 
	__le32 *txwi = (__le32 *)(skb->data - MT_USB_TXD_SIZE);



	memset(txwi, 0, MT_USB_TXD_SIZE);

	mt7615_mac_write_txwi(dev, txwi, skb, wcid, sta, pid, key, false);

	mt7615_mac_write_txwi(dev, txwi, skb, wcid, sta, pid, key, qid, false);

	skb_push(skb, MT_USB_TXD_SIZE);

}