Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / net / wireless / iwlwifi / iwl-dev.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index c273804..6c9790c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -31,6 +31,7 @@
 #ifndef __iwl_dev_h__
 #define __iwl_dev_h__
 
+#include <linux/interrupt.h>
 #include <linux/pci.h> /* for struct pci_device_id */
 #include <linux/kernel.h>
 #include <linux/wait.h>
@@ -551,7 +552,8 @@ enum iwl_ucode_tlv_type {
        IWL_UCODE_TLV_INIT_ERRLOG_PTR   = 13,
        IWL_UCODE_TLV_ENHANCE_SENS_TBL  = 14,
        IWL_UCODE_TLV_PHY_CALIBRATION_SIZE = 15,
-       /* 16 and 17 reserved for future use */
+       IWL_UCODE_TLV_WOWLAN_INST       = 16,
+       IWL_UCODE_TLV_WOWLAN_DATA       = 17,
        IWL_UCODE_TLV_FLAGS             = 18,
 };
 
@@ -1151,6 +1153,8 @@ struct iwl_rxon_context {
 
        __le32 station_flags;
 
+       int beacon_int;
+
        struct {
                bool non_gf_sta_present;
                u8 protection;
@@ -1284,6 +1288,7 @@ struct iwl_priv {
 
        struct fw_img ucode_rt;
        struct fw_img ucode_init;
+       struct fw_img ucode_wowlan;
 
        enum iwlagn_ucode_type ucode_type;
        u8 ucode_write_complete;        /* the image write is complete */
@@ -1356,6 +1361,8 @@ struct iwl_priv {
 
        u8 mac80211_registered;
 
+       bool wowlan;
+
        /* eeprom -- this is in the card's little endian byte order */
        u8 *eeprom;
        int    nvm_device_type;
@@ -1508,6 +1515,7 @@ struct iwl_priv {
        struct dentry *debugfs_dir;
        u32 dbgfs_sram_offset, dbgfs_sram_len;
        bool disable_ht40;
+       void *wowlan_sram;
 #endif /* CONFIG_IWLWIFI_DEBUGFS */
 
        struct work_struct txpower_work;
@@ -1528,6 +1536,11 @@ struct iwl_priv {
        u32 tm_fixed_rate;
 #endif
 
+       /* WoWLAN GTK rekey data */
+       u8 kck[NL80211_KCK_LEN], kek[NL80211_KEK_LEN];
+       __le64 replay_ctr;
+       __le16 last_seq_ctl;
+       bool have_rekey_data;
 }; /*iwl_priv */
 
 static inline void iwl_txq_ctx_activate(struct iwl_priv *priv, int txq_id)