From: Jakub Kicinski <kuba@kernel.org>
Date: Sat, 6 Feb 2021 17:36:03 +0000 (-0800)
Subject: Merge tag 'wireless-drivers-next-2021-02-05' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v5.12-rc1~200^2~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c90597bdebb5ff8d410edd8c556a6b5195503ca5;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'wireless-drivers-next-2021-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for v5.12

First set of patches for v5.12. A smaller pull request this time,
biggest feature being a better key handling for ath9k. And of course
the usual fixes and cleanups all over.

Major changes:

ath9k
 * more robust encryption key cache management

brcmfmac
 * support BCM4365E with 43666 ChipCommon chip ID

* tag 'wireless-drivers-next-2021-02-05' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next: (35 commits)
  iwl4965: do not process non-QOS frames on txq->sched_retry path
  mt7601u: process tx URBs with status EPROTO properly
  wlcore: Fix command execute failure 19 for wl12xx
  mt7601u: use ieee80211_rx_list to pass frames to the network stack as a batch
  rtw88: 8723de: adjust the LTR setting
  rtlwifi: rtl8821ae: fix bool comparison in expressions
  rtlwifi: rtl8192se: fix bool comparison in expressions
  rtlwifi: rtl8188ee: fix bool comparison in expressions
  rtlwifi: rtl8192c-common: fix bool comparison in expressions
  rtlwifi: rtl_pci: fix bool comparison in expressions
  wlcore: Downgrade exceeded max RX BA sessions to debug
  wilc1000: use flexible-array member instead of zero-length array
  brcmfmac: clear EAP/association status bits on linkdown events
  brcmfmac: Delete useless kfree code
  qtnfmac_pcie: Use module_pci_driver
  mt7601u: check the status of device in calibration
  mt7601u: process URBs in status EPROTO properly
  brcmfmac: support BCM4365E with 43666 ChipCommon chip ID
  wilc1000: fix spelling mistake in Kconfig "devision" -> "division"
  mwifiex: pcie: Drop bogus __refdata annotation
  ...
====================

Link: https://lore.kernel.org/r/20210205161901.C7F83C433ED@smtp.codeaurora.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

c90597bdebb5ff8d410edd8c556a6b5195503ca5
diff --cc drivers/net/wireless/mediatek/mt7601u/dma.c
index af7d1ecb777c0,1342cf77ef14c..ed78d2cb35e3c
--- a/drivers/net/wireless/mediatek/mt7601u/dma.c
+++ b/drivers/net/wireless/mediatek/mt7601u/dma.c
@@@ -150,9 -157,12 +157,11 @@@ mt7601u_rx_process_entry(struct mt7601u
  	if (cnt > 1)
  		trace_mt_rx_dma_aggr(dev, cnt, !!new_p);
  
+ 	netif_receive_skb_list(&list);
+ 
  	if (new_p) {
  		/* we have one extra ref from the allocator */
 -		__free_pages(e->p, MT_RX_ORDER);
 -
 +		put_page(e->p);
  		e->p = new_p;
  	}
  }