Merge tag 'wireless-drivers-next-for-davem-2018-12-20' of git://git.kernel.org/pub...

Kalle Valo says:

====================
wireless-drivers-next patches for 4.21

Last set of patches for 4.21. mt76 is still in very active development
and having some refactoring as well as new features. But also other
drivers got few new features and fixes.

Major changes:

ath10k

* add amsdu support for QCA6174 monitor mode

* report tx rate using the new ieee80211_tx_rate_update() API

* wcn3990 support is not experimental anymore

iwlwifi

* support for FW version 43 for 9000 and 22000 series

brcmfmac

* add support for CYW43012 SDIO chipset

* add the raw 4354 PCIe device ID for unprogrammed Cypress boards

mwifiex

* add NL80211_STA_INFO_RX_BITRATE support

mt76

* use the same firmware for mt76x2e and mt76x2u

* mt76x0e survey support

* more unification between mt76x2 and mt76x0

* mt76x0e AP mode support

* mt76x0e DFS support

* rework and fix tx status handling for mt76x0 and mt76x2
====================

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

diff --cc drivers/net/wireless/ath/ath10k/wmi.h
index 66222ee,88210dd..2034ccc
--- 1/drivers/net/wireless/ath/ath10k/wmi.h
--- 2/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@@ -205,7 -205,8 +205,9 @@@ enum wmi_service 
        WMI_SERVICE_SPOOF_MAC_SUPPORT,
        WMI_SERVICE_TX_DATA_ACK_RSSI,
        WMI_SERVICE_VDEV_DIFFERENT_BEACON_INTERVAL_SUPPORT,
+       WMI_SERVICE_VDEV_DISABLE_4_ADDR_SRC_LRN_SUPPORT,
+       WMI_SERVICE_BB_TIMING_CONFIG_SUPPORT,
 +      WMI_SERVICE_THERM_THROT,
  
        /* keep last */
        WMI_SERVICE_MAX,

diff --cc drivers/net/wireless/intel/ipw2x00/ipw2100.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/fw.c
Simple merge

diff --cc drivers/net/wireless/mediatek/mt76/tx.c
Simple merge