iwlwifi: reorganize TX RX constatns
authorTomas Winkler <tomas.winkler@intel.com>
Thu, 24 Apr 2008 00:15:00 +0000 (17:15 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 7 May 2008 19:02:19 +0000 (15:02 -0400)
This patch moves TX/RX constants in 4969 headers

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-4965-commands.h
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-4965.h

index 7ffae05a930e906b96f7cb0a317284b86be0ea0d..6b2d6bfec1e55293f408481d32c69f120534c71d 100644 (file)
@@ -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.
index e80f6022cf43a4e4f8ed9a14d2e51b940632e93e..f5796b78f2d2cbaf5c8b2e1cddc2064aa9513035 100644 (file)
@@ -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
  */
index 1ab4e2ecf79a804b0da85d05290574f6f7db9855..e3572636e59861a88277f5150cb32b8132718b73 100644 (file)
@@ -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,