diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-02-26 16:58:18 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-02-26 16:58:18 -0500 |
| commit | be41f5c7e3688a4555d7fbaa09578fd628bb4cdf (patch) | |
| tree | 00cbd312faf655670909ff3c3418f8f2dd664799 /drivers/net/wireless/iwlwifi/iwl-commands.h | |
| parent | 64463da913bc8f791980ba28d93ac5e716ab9cc5 (diff) | |
| parent | 89612124d6d62230043ebd827a2b54ea5ea5280c (diff) | |
Merge branch 'wireless-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 | 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 | /* |