From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 12 Jun 2013 19:39:05 +0000 (-0400)
Subject: Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=812fd645968118c35a3f4d0d18dd3f4d07221df0;p=deliverable%2Flinux.git

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

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

812fd645968118c35a3f4d0d18dd3f4d07221df0
diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
index f091cf24b96c,c942eb0bbbeb..e08683b20531
--- a/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");
  		}
 +		ret = iwl_mvm_power_update_mode(mvm, vif);
 +		if (ret)
 +			IWL_ERR(mvm, "failed to update power mode\n");
- 	} else if (changes & BSS_CHANGED_DTIM_PERIOD) {
+ 	} 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 ad39a22f79fa,109200bdf5c5..c7409f159a36
--- a/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