From: Kalle Valo <kvalo@kernel.org>
Date: Tue, 17 Jan 2023 11:36:25 +0000 (+0200)
Subject: Merge wireless into wireless-next
X-Git-Tag: v6.3-rc1~162^2~227^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0e99511834b6828c960e978d9a8cb6e5731250d;p=thirdparty%2Fkernel%2Flinux.git

Merge wireless into wireless-next

Due to the two cherry picked commits from wireless to wireless-next we have
several conflicts in mt76. To avoid any bugs with conflicts merge wireless into
wireless-next.

96f134dc1964 wifi: mt76: handle possible mt76_rx_token_consume failures
fe13dad8992b wifi: mt76: dma: do not increment queue head if mt76_dma_add_buf fails
---

d0e99511834b6828c960e978d9a8cb6e5731250d
diff --cc drivers/net/wireless/mediatek/mt76/dma.c
index 5d582186ed580,06161815c180e..8de9376765c04
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@@ -570,15 -612,7 +598,7 @@@ mt76_dma_rx_fill(struct mt76_dev *dev, 
  		struct mt76_queue_buf qbuf;
  		void *buf = NULL;
  
- 		if ((q->flags & MT_QFLAG_WED) &&
- 		    FIELD_GET(MT_QFLAG_WED_TYPE, q->flags) == MT76_WED_Q_RX) {
- 			t = mt76_get_rxwi(dev);
- 			if (!t)
- 				break;
- 		}
- 
 -		buf = page_frag_alloc(rx_page, q->buf_size, GFP_ATOMIC);
 +		buf = page_frag_alloc(&q->rx_page, q->buf_size, GFP_ATOMIC);
  		if (!buf)
  			break;