summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/mvm.h
diff options
context:
space:
mode:
authorJohannes Berg2013-02-26 12:04:18 +0100
committerJohannes Berg2013-02-27 09:14:04 +0100
commitf444eb10d537c776ce82fbcd07733d75f45346f1 (patch)
treee60d2b69a30d3f29a4e71f01d5753ef6db226aa8 /drivers/net/wireless/iwlwifi/mvm/mvm.h
parentiwlwifi: mvm: fix AP/GO mode station removal (diff)
downloadkernel-qcow2-linux-f444eb10d537c776ce82fbcd07733d75f45346f1.tar.gz
kernel-qcow2-linux-f444eb10d537c776ce82fbcd07733d75f45346f1.tar.xz
kernel-qcow2-linux-f444eb10d537c776ce82fbcd07733d75f45346f1.zip
iwlwifi: fix wakeup status query and packet reporting
The wakeup packet in the status response is padded out to a multiple of 4 bytes by the firmware for transfer to the host, take that into account when checking the length of the command. Also, the reported wakeup packet includes the FCS but the userspace API doesn't, so remove that. If it is a data packet it is reported as an 802.3 packet but I forgot to take into account and remove the encryption head/tail, fix all of that as well. Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mvm.h')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/mvm.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mvm.h b/drivers/net/wireless/iwlwifi/mvm/mvm.h
index 4e339ccfa800..537711b10478 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/iwlwifi/mvm/mvm.h
@@ -327,6 +327,10 @@ struct iwl_mvm {
struct led_classdev led;
struct ieee80211_vif *p2p_device_vif;
+
+#ifdef CONFIG_PM_SLEEP
+ int gtk_ivlen, gtk_icvlen, ptk_ivlen, ptk_icvlen;
+#endif
};
/* Extract MVM priv from op_mode and _hw */