From d69b9095526ebd887abca6b1f13588eff40b6eec Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Wed, 23 Apr 2008 17:15:00 -0700
Subject: [PATCH] --- yaml --- r: 102469 b: refs/heads/master c:
 3195cdb7424b4207f6903f1f3ddadcab49fa22f2 h: refs/heads/master i:   102467:
 8b608b7e34c7652381694617a513c918e45c6fae v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-4965-commands.h | 8 ++++++++
 trunk/drivers/net/wireless/iwlwifi/iwl-4965.c          | 3 ---
 trunk/drivers/net/wireless/iwlwifi/iwl-4965.h          | 7 +++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a22510fd63bc..ebadb4c0951c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aade00cee60d8a2b1682b6804664049d7a369ac2
+refs/heads/master: 3195cdb7424b4207f6903f1f3ddadcab49fa22f2
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-commands.h b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
index 7ffae05a930e..6b2d6bfec1e5 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965-commands.h
@@ -1100,6 +1100,14 @@ struct iwl4965_rx_mpdu_res_start {
 #define TX_CMD_SEC_SHIFT	6
 #define TX_CMD_SEC_KEY128	0x08
 
+/*
+ * security overhead sizes
+ */
+#define WEP_IV_LEN 4
+#define WEP_ICV_LEN 4
+#define CCMP_MIC_LEN 8
+#define TKIP_ICV_LEN 4
+
 /*
  * 4965 uCode updates these Tx attempt count values in host DRAM.
  * Used for managing Tx retries when expecting block-acks.
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c
index e80f6022cf43..f5796b78f2d2 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -2502,9 +2502,6 @@ static void iwl4965_free_shared_mem(struct iwl_priv *priv)
 				    priv->shared_phys);
 }
 
-#define IWL_TX_CRC_SIZE		4
-#define IWL_TX_DELIMITER_SIZE	4
-
 /**
  * iwl4965_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
  */
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h
index 1ab4e2ecf79a..e3572636e598 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.h
@@ -803,8 +803,8 @@ struct iwl4965_kw {
 #define IWL_EXT_CHANNEL_OFFSET_RESERVE1  2
 #define IWL_EXT_CHANNEL_OFFSET_BELOW     3
 
-#define NRG_NUM_PREV_STAT_L     20
-#define NUM_RX_CHAINS           (3)
+#define IWL_TX_CRC_SIZE 4
+#define IWL_TX_DELIMITER_SIZE 4
 
 #define TX_POWER_IWL_ILLEGAL_VOLTAGE -10000
 
@@ -854,6 +854,9 @@ struct iwl4965_lq_mngr {
 #define IN_BAND_FILTER			0xFF
 #define MIN_AVERAGE_NOISE_MAX_VALUE	0xFFFFFFFF
 
+#define NRG_NUM_PREV_STAT_L     20
+#define NUM_RX_CHAINS           3
+
 enum iwl4965_false_alarm_state {
 	IWL_FA_TOO_MANY = 0,
 	IWL_FA_TOO_FEW = 1,