openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlwifi: reorganize TX RX constatns 

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>
This commit is contained in:
Tomas Winkler 2008-04-23 17:15:00 -07:00 committed by John W. Linville
parent aade00cee6
commit 3195cdb742
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/iwlwifi/iwl-4965-commands.h
View File

@ -1100,6 +1100,14 @@ struct iwl4965_rx_mpdu_res_start {
#define TX_CMD_SEC_SHIFT 6 #define TX_CMD_SEC_SHIFT 6
#define TX_CMD_SEC_KEY128 0x08 #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. * 4965 uCode updates these Tx attempt count values in host DRAM.
* Used for managing Tx retries when expecting block-acks. * Used for managing Tx retries when expecting block-acks.

3
drivers/net/wireless/iwlwifi/iwl-4965.c
View File

@ -2502,9 +2502,6 @@ static void iwl4965_free_shared_mem(struct iwl_priv *priv)
priv->shared_phys); 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 * iwl4965_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
*/ */

7
drivers/net/wireless/iwlwifi/iwl-4965.h
View File

@ -803,8 +803,8 @@ struct iwl4965_kw {
#define IWL_EXT_CHANNEL_OFFSET_RESERVE1 2 #define IWL_EXT_CHANNEL_OFFSET_RESERVE1 2
#define IWL_EXT_CHANNEL_OFFSET_BELOW 3 #define IWL_EXT_CHANNEL_OFFSET_BELOW 3
#define NRG_NUM_PREV_STAT_L 20 #define IWL_TX_CRC_SIZE 4
#define NUM_RX_CHAINS (3) #define IWL_TX_DELIMITER_SIZE 4
#define TX_POWER_IWL_ILLEGAL_VOLTAGE -10000 #define TX_POWER_IWL_ILLEGAL_VOLTAGE -10000
@ -854,6 +854,9 @@ struct iwl4965_lq_mngr {
#define IN_BAND_FILTER 0xFF #define IN_BAND_FILTER 0xFF
#define MIN_AVERAGE_NOISE_MAX_VALUE 0xFFFFFFFF #define MIN_AVERAGE_NOISE_MAX_VALUE 0xFFFFFFFF
#define NRG_NUM_PREV_STAT_L 20
#define NUM_RX_CHAINS 3
enum iwl4965_false_alarm_state { enum iwl4965_false_alarm_state {
IWL_FA_TOO_MANY = 0, IWL_FA_TOO_MANY = 0,
IWL_FA_TOO_FEW = 1, IWL_FA_TOO_FEW = 1,