Merge tag 'wireless-drivers-next-for-davem-2015-02-07' of git://git.kernel.org/pub...

Major changes:

iwlwifi:

* more work for new devices (4165 / 8260)
* cleanups / improvemnts in rate control
* fixes for TDLS
* major statistics work from Johannes - more to come
* improvements for the fw error dump infrastructure
* usual amount of small fixes here and there (scan, D0i3 etc...)
* add support for beamforming
* enable stuck queue detection for iwlmvm
* a few fixes for EBS scan
* fixes for various failure paths
* improvements for TDLS Offchannel

wil6210:

* performance tuning
* some AP features

brcm80211:

* rework some code in SDIO part of the brcmfmac driver related to
  suspend/resume that were found doing stress testing
* in PCIe part scheduling of worker thread needed to be relaxed
* minor fixes and exposing firmware revision information to
  user-space, ie. ethtool.

mwifiex:

* enhancements for change virtual interface handling
* remove coupling between netdev and FW supported interface
  combination, now conversion from any type of supported interface
  types to any other type is possible
* DFS support in AP mode

ath9k:

* fix calibration issues on some boards
* Wake-on-WLAN improvements

ath10k:

* add support for qca6174 hardware
* enable RX batching to reduce CPU load

Conflicts:
	drivers/net/wireless/rtlwifi/pci.c

Conflict resolution is to get rid of the 'end' label and keep
the rest.

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

diff --cc drivers/net/wireless/ath/ath10k/mac.c
index 60a524b732079c6487a68b5494d8ad74c938815f,1cebd32190686411fb88f53c61448a74ba089a77..d6d2f0f00caad18ec00ba69f5635c79f161b2ba7
--- 1/drivers/net/wireless/ath/ath10k/mac.c
--- 2/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@@ -75,10 -72,10 +72,13 @@@ static int ath10k_send_key(struct ath10
                 * Otherwise pairwise key must be set */
                if (memcmp(macaddr, arvif->vif->addr, ETH_ALEN))
                        arg.key_flags = WMI_KEY_PAIRWISE;
+ 
+               if (def_idx)
+                       arg.key_flags |= WMI_KEY_TX_USAGE;
                break;
 +      case WLAN_CIPHER_SUITE_AES_CMAC:
 +              /* this one needs to be done in software */
 +              return 1;
        default:
                ath10k_warn(ar, "cipher %d is not supported\n", key->cipher);
                return -EOPNOTSUPP;

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
index c70efb9a6e78ccf22170bb8bbfe0abe89be695ef,88331d729b0e798d1ae6cf4c2047f23effeefb0a..ec456f0d972eb583f4f2bbfda84472680b2513f0
--- 1/drivers/net/wireless/rtlwifi/pci.c
--- 2/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@@ -924,17 -917,14 +931,16 @@@ new_trx_end
                        rtlpriv->enter_ps = false;
                        schedule_work(&rtlpriv->works.lps_change_work);
                }
- end:
 +              skb = new_skb;
 +no_new:
                if (rtlpriv->use_new_trx_flow) {
 -                      _rtl_pci_init_one_rxdesc(hw, (u8 *)buffer_desc,
 +                      _rtl_pci_init_one_rxdesc(hw, skb, (u8 *)buffer_desc,
                                                 rxring_idx,
 -                                             rtlpci->rx_ring[rxring_idx].idx);
 +                                               rtlpci->rx_ring[rxring_idx].idx);
                } else {
 -                      _rtl_pci_init_one_rxdesc(hw, (u8 *)pdesc, rxring_idx,
 +                      _rtl_pci_init_one_rxdesc(hw, skb, (u8 *)pdesc,
 +                                               rxring_idx,
                                                 rtlpci->rx_ring[rxring_idx].idx);
 -
                        if (rtlpci->rx_ring[rxring_idx].idx ==
                            rtlpci->rxringcount - 1)
                                rtlpriv->cfg->ops->set_desc(hw, (u8 *)pdesc,