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

Kalle Valo says:

====================
ath10k:

* enable channel 144 on 5 GHz
* enable Adaptive Noise Immunity (ANI) by default
* add Wake on Wireless LAN (WOW) patterns support
* add basic Tunneled Direct Link Setup (TDLS) support
* add multi-channel support for QCA6174
* enable IBSS RSN support
* enable Bluetooth Coexistance whenever firmware supports it
* add more versatile way to set bitrates used by the firmware

ath9k:

* spectral scan: add support for multiple FFT frames per report

iwlwifi:

* major rework of the scan code (Luca)
* some work on the thermal code (Chaya Rachel)
* some work on the firwmare debugging infrastructure

brcmfmac:

* SDIO suspend and resume fixes
* wiphy band info and changes in regulatory settings
* add support for BCM4324 SDIO and BCM4358 PCIe
* enable support of PCIe devices on router platforms (Hante)
====================

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

diff --cc drivers/net/wireless/ath/ath10k/mac.c
index fcd08b2f8d26ac4bcb634668a64d8cc500c829ec,eaa0182e001dedcfe3b61aa9fc720a549efa1864..539b2b62b58a5e2ae745a52505f029ddd7d42298
--- 1/drivers/net/wireless/ath/ath10k/mac.c
--- 2/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@@ -766,9 -1031,68 +1031,48 @@@ static int ath10k_monitor_stop(struct a
        return 0;
  }
  
 -static bool ath10k_mac_should_disable_promisc(struct ath10k *ar)
 -{
 -      struct ath10k_vif *arvif;
 -
 -      if (!(ar->filter_flags & FIF_PROMISC_IN_BSS))
 -              return true;
 -
 -      if (!ar->num_started_vdevs)
 -              return false;
 -
 -      list_for_each_entry(arvif, &ar->arvifs, list)
 -              if (arvif->vdev_type != WMI_VDEV_TYPE_AP)
 -                      return false;
 -
 -      ath10k_dbg(ar, ATH10K_DBG_MAC,
 -                 "mac disabling promiscuous mode because vdev is started\n");
 -      return true;
 -}
 -
+ static bool ath10k_mac_monitor_vdev_is_needed(struct ath10k *ar)
+ {
+       int num_ctx;
+ 
+       /* At least one chanctx is required to derive a channel to start
+        * monitor vdev on.
+        */
+       num_ctx = ath10k_mac_num_chanctxs(ar);
+       if (num_ctx == 0)
+               return false;
+ 
+       /* If there's already an existing special monitor interface then don't
+        * bother creating another monitor vdev.
+        */
+       if (ar->monitor_arvif)
+               return false;
+ 
+       return ar->monitor ||
 -             !ath10k_mac_should_disable_promisc(ar) ||
+              test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);
+ }
+ 
+ static bool ath10k_mac_monitor_vdev_is_allowed(struct ath10k *ar)
+ {
+       int num_ctx;
+ 
+       num_ctx = ath10k_mac_num_chanctxs(ar);
+ 
+       /* FIXME: Current interface combinations and cfg80211/mac80211 code
+        * shouldn't allow this but make sure to prevent handling the following
+        * case anyway since multi-channel DFS hasn't been tested at all.
+        */
+       if (test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags) && num_ctx > 1)
+               return false;
+ 
+       return true;
+ }
+ 
  static int ath10k_monitor_recalc(struct ath10k *ar)
  {
-       bool should_start;
+       bool needed;
+       bool allowed;
+       int ret;
  
        lockdep_assert_held(&ar->conf_mutex);
  
@@@ -871,12 -1231,46 +1211,46 @@@ static void ath10k_recalc_radar_detecti
        }
  }
  
- static int ath10k_vdev_start_restart(struct ath10k_vif *arvif, bool restart)
+ static int ath10k_vdev_stop(struct ath10k_vif *arvif)
+ {
+       struct ath10k *ar = arvif->ar;
+       int ret;
+ 
+       lockdep_assert_held(&ar->conf_mutex);
+ 
+       reinit_completion(&ar->vdev_setup_done);
+ 
+       ret = ath10k_wmi_vdev_stop(ar, arvif->vdev_id);
+       if (ret) {
+               ath10k_warn(ar, "failed to stop WMI vdev %i: %d\n",
+                           arvif->vdev_id, ret);
+               return ret;
+       }
+ 
+       ret = ath10k_vdev_setup_sync(ar);
+       if (ret) {
+               ath10k_warn(ar, "failed to syncronise setup for vdev %i: %d\n",
+                           arvif->vdev_id, ret);
+               return ret;
+       }
+ 
+       WARN_ON(ar->num_started_vdevs == 0);
+ 
+       if (ar->num_started_vdevs != 0) {
+               ar->num_started_vdevs--;
+               ath10k_recalc_radar_detection(ar);
+       }
+ 
+       return ret;
+ }
+ 
+ static int ath10k_vdev_start_restart(struct ath10k_vif *arvif,
+                                    const struct cfg80211_chan_def *chandef,
+                                    bool restart)
  {
        struct ath10k *ar = arvif->ar;
-       struct cfg80211_chan_def *chandef = &ar->chandef;
        struct wmi_vdev_start_request_arg arg = {};
 -      int ret = 0, ret2;
 +      int ret = 0;
  
        lockdep_assert_held(&ar->conf_mutex);
  
@@@ -5499,9 -6915,14 +6884,15 @@@ int ath10k_mac_register(struct ath10k *
                        IEEE80211_HW_AP_LINK_PS |
                        IEEE80211_HW_SPECTRUM_MGMT |
                        IEEE80211_HW_SW_CRYPTO_CONTROL |
-                       IEEE80211_HW_SUPPORT_FAST_XMIT;
++                      IEEE80211_HW_SUPPORT_FAST_XMIT |
+                       IEEE80211_HW_CONNECTION_MONITOR |
+                       IEEE80211_HW_SUPPORTS_PER_STA_GTK |
+                       IEEE80211_HW_WANT_MONITOR_VIF |
+                       IEEE80211_HW_CHANCTX_STA_CSA |
+                       IEEE80211_HW_QUEUE_CONTROL;
  
        ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS;
+       ar->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
  
        if (ar->ht_cap_info & WMI_HT_CAP_DYNAMIC_SMPS)
                ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;

diff --cc drivers/net/wireless/ti/wlcore/main.c
Simple merge