diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-06-25 12:20:16 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-25 12:20:16 +0200 |
| commit | 9277326e1e5d395397fbe20c0f310cf30bfbacc2 (patch) | |
| tree | dc60601afda52bf7059d0b06781a3b2cdf26ed96 /drivers/net/wireless/iwlwifi/mvm/mvm.h | |
| parent | iwlwifi: always use 'trans_pcie' name (diff) | |
| parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-9277326e1e5d395397fbe20c0f310cf30bfbacc2.tar.xz linux-9277326e1e5d395397fbe20c0f310cf30bfbacc2.zip | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h index 1c6476eac496..c6ba553845cd 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h @@ -459,6 +459,7 @@ 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 */ |