Merge tag 'iwlwifi-next-for-kalle-2015-03-12' of https://git.kernel.org/pub/scm/linux...

* Location Aware Regulatory was added by Arik
* 8000 device family work
* Update to the BT Coex firmware API

diff --combined drivers/net/wireless/iwlwifi/mvm/power.c
index 33bbdde0046fa29575f7fd72c9e2d1a1af144bd1,9c6fce10fe0bdb4f1e19b0db9046701957c8cf71..d2c6ba9d326b4656b8f6e7007554fb3a5ba8e681
--- 1/drivers/net/wireless/iwlwifi/mvm/power.c
--- 2/drivers/net/wireless/iwlwifi/mvm/power.c
+++ b/drivers/net/wireless/iwlwifi/mvm/power.c
@@@ -66,7 -66,6 +66,7 @@@
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/slab.h>
 +#include <linux/etherdevice.h>
  
  #include <net/mac80211.h>
  
@@@ -358,7 -357,7 +358,7 @@@ static void iwl_mvm_power_build_cmd(str
        cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_SAVE_ENA_MSK);
  
        if (!vif->bss_conf.ps || iwl_mvm_vif_low_latency(mvmvif) ||
-           !mvmvif->pm_enabled || iwl_mvm_tdls_sta_count(mvm, vif))
+           !mvmvif->pm_enabled)
                return;
  
        cmd->flags |= cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK);
@@@ -492,7 -491,7 +492,7 @@@ void iwl_mvm_power_vif_assoc(struct iwl
  
        if (memcmp(vif->bss_conf.bssid, mvmvif->uapsd_misbehaving_bssid,
                   ETH_ALEN))
 -              memset(mvmvif->uapsd_misbehaving_bssid, 0, ETH_ALEN);
 +              eth_zero_addr(mvmvif->uapsd_misbehaving_bssid);
  }
  
  static void iwl_mvm_power_uapsd_misbehav_ap_iterator(void *_data, u8 *mac,
@@@ -639,6 -638,10 +639,10 @@@ static void iwl_mvm_power_set_pm(struc
        if (vifs->ap_vif)
                ap_mvmvif = iwl_mvm_vif_from_mac80211(vifs->ap_vif);
  
+       /* don't allow PM if any TDLS stations exist */
+       if (iwl_mvm_tdls_sta_count(mvm, NULL))
+               return;
+ 
        /* enable PM on bss if bss stand alone */
        if (vifs->bss_active && !vifs->p2p_active && !vifs->ap_active) {
                bss_mvmvif->pm_enabled = true;