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/dvm/dev.h | |
parent | cfb4e624314b657ea5831505a380d932f3313a7a (diff) | |
parent | 9fbdc75116f7a2b183464d42f3abccb616584105 (diff) | |
download | blackbird-op-linux-9277326e1e5d395397fbe20c0f310cf30bfbacc2.tar.gz blackbird-op-linux-9277326e1e5d395397fbe20c0f310cf30bfbacc2.zip |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/dev.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/dev.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/dev.h b/drivers/net/wireless/iwlwifi/dvm/dev.h index 310a6783051e..60a4e0d15715 100644 --- a/drivers/net/wireless/iwlwifi/dvm/dev.h +++ b/drivers/net/wireless/iwlwifi/dvm/dev.h @@ -904,6 +904,9 @@ struct iwl_priv { __le64 replay_ctr; __le16 last_seq_ctl; bool have_rekey_data; +#ifdef CONFIG_PM_SLEEP + struct wiphy_wowlan_support wowlan_support; +#endif /* device_pointers: pointers to ucode event tables */ struct { |