diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:53:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:53:49 -0400 |
| commit | 1d7d969dd0b467ba32cf3829e8bf104a5084150d (patch) | |
| tree | f0de3aca8a33bed612ba2c09f61fcabe289dc14d /drivers/net/wireless/iwlwifi/iwl-commands.h | |
| parent | 12ef116bf750c221e214e33c61e7f4c98300b5fd (diff) | |
| parent | f8478df1eab2f11aefc4b6668c5867949ab96bd7 (diff) | |
| download | talos-op-linux-1d7d969dd0b467ba32cf3829e8bf104a5084150d.tar.gz talos-op-linux-1d7d969dd0b467ba32cf3829e8bf104a5084150d.zip | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-commands.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index 67c723cc32d2..0086019b7a15 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h @@ -2663,7 +2663,9 @@ struct iwl_ssid_ie { #define PROBE_OPTION_MAX_3945 4 #define PROBE_OPTION_MAX 20 #define TX_CMD_LIFE_TIME_INFINITE cpu_to_le32(0xFFFFFFFF) -#define IWL_GOOD_CRC_TH cpu_to_le16(1) +#define IWL_GOOD_CRC_TH_DISABLED 0 +#define IWL_GOOD_CRC_TH_DEFAULT cpu_to_le16(1) +#define IWL_GOOD_CRC_TH_NEVER cpu_to_le16(0xffff) #define IWL_MAX_SCAN_SIZE 1024 #define IWL_MAX_CMD_SIZE 4096 #define IWL_MAX_PROBE_REQUEST 200 |
