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

diff --cc drivers/net/wireless/mediatek/mt76/dma.c
index 5d582186ed580f0fd8c2a94ecc9854478774aa7f,06161815c180edc6055e08835104aa4d1f259ff7..8de9376765c04a1a71408d9fe26e82130d3f31ea
--- 1/drivers/net/wireless/mediatek/mt76/dma.c
--- 2/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;
  

diff --cc include/net/mac80211.h
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge