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

mt76: mt7663s: do not use altx for ctl/mgmt traffic 



Since the sdio engine does not report quota for altx queue, move
ctl/mgmt traffic to standard data queues

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 6892555d

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

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static int mt7663s_probe(struct sdio_func *func, 
{

	static const struct mt76_driver_ops drv_ops = {

		.txwi_size = MT_USB_TXD_SIZE,

		.drv_flags = MT_DRV_RX_DMA_HDR | MT_DRV_HW_MGMT_TXQ,

		.drv_flags = MT_DRV_RX_DMA_HDR,

		.tx_prepare_skb = mt7663_usb_sdio_tx_prepare_skb,

		.tx_complete_skb = mt7663_usb_sdio_tx_complete_skb,

		.tx_status_data = mt7663_usb_sdio_tx_status_data,

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

+3 −9
Original line number Diff line number Diff line
@@ -124,16 +124,14 @@ static int mt7663s_tx_update_sched(struct mt76_dev *dev, 
				   bool mcu)

{

	struct mt76_sdio *sdio = &dev->sdio;

	struct mt76_phy *mphy = &dev->phy;

	struct ieee80211_hdr *hdr;

	int size, ret = -EBUSY;



	if (!test_bit(MT76_STATE_MCU_RUNNING, &dev->phy.state))

		return 0;



	size = DIV_ROUND_UP(e->buf_sz + sdio->sched.deficit, MT_PSE_PAGE_SZ);



	if (mcu) {

		if (!test_bit(MT76_STATE_MCU_RUNNING, &mphy->state))

			return 0;



		mutex_lock(&sdio->sched.lock);

		if (sdio->sched.pse_mcu_quota > size) {

			sdio->sched.pse_mcu_quota -= size;
@@ -144,10 +142,6 @@ static int mt7663s_tx_update_sched(struct mt76_dev *dev, 
		return ret;

	}



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

	if (ieee80211_is_ctl(hdr->frame_control))

		return 0;



	mutex_lock(&sdio->sched.lock);

	if (sdio->sched.pse_data_quota > size &&

	    sdio->sched.ple_data_quota > 0) {