diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-27 05:05:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-27 05:05:54 -0500 |
| commit | ce300c7ffa61165f9bfd16e511ee0cd4114977ab (patch) | |
| tree | 874b57409bad0c9620a431272e6bf5c94e270253 /drivers/net/wireless/iwlwifi/iwl-commands.h | |
| parent | 8266d7127c1b0bdf924066c19c71be4d351e9583 (diff) | |
| parent | 9e3bd9190800e8209b4a3e1d724c35f0738dcad2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-commands.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-commands.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h index ab3c77b92cc8..6383d9f8c9b3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-commands.h +++ b/drivers/net/wireless/iwlwifi/iwl-commands.h | |||
| @@ -2623,6 +2623,7 @@ struct iwl_ssid_ie { | |||
| 2623 | #define TX_CMD_LIFE_TIME_INFINITE cpu_to_le32(0xFFFFFFFF) | 2623 | #define TX_CMD_LIFE_TIME_INFINITE cpu_to_le32(0xFFFFFFFF) |
| 2624 | #define IWL_GOOD_CRC_TH cpu_to_le16(1) | 2624 | #define IWL_GOOD_CRC_TH cpu_to_le16(1) |
| 2625 | #define IWL_MAX_SCAN_SIZE 1024 | 2625 | #define IWL_MAX_SCAN_SIZE 1024 |
| 2626 | #define IWL_MAX_CMD_SIZE 4096 | ||
| 2626 | #define IWL_MAX_PROBE_REQUEST 200 | 2627 | #define IWL_MAX_PROBE_REQUEST 200 |
| 2627 | 2628 | ||
| 2628 | /* | 2629 | /* |