From: David S. Miller <davem@davemloft.net>
Date: Sun, 5 May 2019 17:20:53 +0000 (-0700)
Subject: Merge tag 'wireless-drivers-next-for-davem-2019-05-03' of git://git.kernel.org/pub... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6ffe0acc935f344eb0b35da07c034d5122222e77;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'wireless-drivers-next-for-davem-2019-05-03' of git://git./linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 5.2

Most likely the last patchset of new feature for 5.2, and this time we
have quite a lot of new features. Most obvious being rtw88 from
Realtek which supports RTL8822BE and RTL8822CE 802.11ac devices. We
have also new hardware support for existing drivers and improvements.

There's one conflict in iwlwifi, my example conflict resolution below.

Major changes:

iwlwifi

* bump the 20000-series FW API version

* work on new hardware continues

* RTT confidence indication support for Fine Timing Measurement (FTM)

* an improvement in HE (802.11ax) rate-scaling

* add command version parsing from the fimware TLVs

* add support for a new WoWLAN patterns firmware API

rsi

* add support for rs9116

mwifiex

* add support for SD8987

brcmfmac

* add quirk for ACEPC T8 and T11 mini PCs

rt2x00

* add RT3883 support

qtnfmac

* fix debugfs interface to support multiple cards

rtw88

* new driver

mt76

* share more code across drivers

* add support for MT7615 chipset

* rework DMA API

* tx/rx performance optimizations

* use NAPI for tx cleanup on mt76x02

* AP mode support for USB devices

* USB stability fixes

* tx power handling fixes for 76x2

* endian fixes

Conflicts:

There's a trivial conflict in
drivers/net/wireless/intel/iwlwifi/fw/file.h, just leave
IWL_UCODE_TLV_FW_FSEQ_VERSION to the file. 'git diff' output should be
just empty:

diff --cc drivers/net/wireless/intel/iwlwifi/fw/file.h
index cd622af90077,b0671e16e1ce..000000000000
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

6ffe0acc935f344eb0b35da07c034d5122222e77
diff --cc drivers/net/wireless/intel/iwlwifi/fw/file.h
index cd622af90077,b0671e16e1ce..de9243d30135
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@@ -148,6 -149,7 +149,7 @@@ enum iwl_ucode_tlv_type 
  	IWL_UCODE_TLV_UMAC_DEBUG_ADDRS	= 54,
  	IWL_UCODE_TLV_LMAC_DEBUG_ADDRS	= 55,
  	IWL_UCODE_TLV_FW_RECOVERY_INFO	= 57,
 -	IWL_UCODE_TLV_FW_FSEQ_VERSION		= 60,
++	IWL_UCODE_TLV_FW_FSEQ_VERSION	= 60,
  
  	IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION	= IWL_UCODE_INI_TLV_GROUP + 0x1,
  	IWL_UCODE_TLV_DEBUG_BASE = IWL_UCODE_TLV_TYPE_BUFFER_ALLOCATION,