Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...

Conflicts:
	drivers/net/wireless/iwlwifi/mvm/mac80211.c

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

diff --cc drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index f091cf24b96c74daab58668f5433948a97baaab5,c942eb0bbbebfcc01b6e99ebfcd51fad16f7f6ba..e08683b2053183f7e7ea9df370a37bdb4b70c2e4
--- 1/drivers/net/wireless/iwlwifi/mvm/mac80211.c
--- 2/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@@ -774,10 -785,7 +774,10 @@@ static void iwl_mvm_bss_info_changed_st
                        if (ret)
                                IWL_ERR(mvm, "failed to update quotas\n");
                }
-       } else if (changes & BSS_CHANGED_DTIM_PERIOD) {
 +              ret = iwl_mvm_power_update_mode(mvm, vif);
 +              if (ret)
 +                      IWL_ERR(mvm, "failed to update power mode\n");
+       } else if (changes & BSS_CHANGED_BEACON_INFO) {
                /*
                 * We received a beacon _after_ association so
                 * remove the session protection.

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
index ad39a22f79fa7776c8c94172dd83b5b14a22c1a9,109200bdf5c5109916ac886f3a0136a116931124..c7409f159a36bf9d28314811b9d4a9fe64d42527
--- 1/drivers/net/wireless/iwlwifi/mvm/mvm.h
--- 2/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@@ -458,12 -457,11 +458,13 @@@ struct iwl_mvm 
        struct ieee80211_vif *p2p_device_vif;
  
  #ifdef CONFIG_PM_SLEEP
+       struct wiphy_wowlan_support wowlan;
        int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;
  #ifdef CONFIG_IWLWIFI_DEBUGFS
 +      bool d3_test_active;
        bool store_d3_resume_sram;
        void *d3_resume_sram;
 +      u32 d3_test_pme_ptr;
  #endif
  #endif