From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 25 Jun 2013 10:20:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9277326e1e5d395397fbe20c0f310cf30bfbacc2;p=linux-beck.git

Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
---

9277326e1e5d395397fbe20c0f310cf30bfbacc2
diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
index 1c6476eac496,c7409f159a36..c6ba553845cd
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@@ -459,9 -458,9 +459,10 @@@ 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
 +	u32 d3_wake_sysassert; /* must be u32 for debugfs_create_bool */
  	bool d3_test_active;
  	bool store_d3_resume_sram;
  	void *d3_resume_sram;