aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-04-20 17:36:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-04-22 16:57:18 -0400
commit9b3bf06abad70db820c74c90118ea49358549d22 (patch)
treee0cc9ab5328f95ecbf4d212c6efbfdc56b01429b /drivers
parentcca84799dfe9f5201ae9c69eb8ed15fd26b72b37 (diff)
iwlwifi: rename PROBE_OPTION_MAX_API1 to PROBE_OPTION_MAX_3945
This limit applies to current (APIv1 and APIv2) 3945 firmware only, not supported firmware of any of the other cards. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-commands.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 29d40746da6a..411a5d2d9148 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2469,8 +2469,8 @@ struct iwl_ssid_ie {
2469 u8 ssid[32]; 2469 u8 ssid[32];
2470} __attribute__ ((packed)); 2470} __attribute__ ((packed));
2471 2471
2472#define PROBE_OPTION_MAX_API1 0x4 2472#define PROBE_OPTION_MAX_3945 4
2473#define PROBE_OPTION_MAX 0x14 2473#define PROBE_OPTION_MAX 20
2474#define TX_CMD_LIFE_TIME_INFINITE cpu_to_le32(0xFFFFFFFF) 2474#define TX_CMD_LIFE_TIME_INFINITE cpu_to_le32(0xFFFFFFFF)
2475#define IWL_GOOD_CRC_TH cpu_to_le16(1) 2475#define IWL_GOOD_CRC_TH cpu_to_le16(1)
2476#define IWL_MAX_SCAN_SIZE 1024 2476#define IWL_MAX_SCAN_SIZE 1024
@@ -2552,7 +2552,7 @@ struct iwl3945_scan_cmd {
2552 struct iwl3945_tx_cmd tx_cmd; 2552 struct iwl3945_tx_cmd tx_cmd;
2553 2553
2554 /* For directed active scans (set to all-0s otherwise) */ 2554 /* For directed active scans (set to all-0s otherwise) */
2555 struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX_API1]; 2555 struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX_3945];
2556 2556
2557 /* 2557 /*
2558 * Probe request frame, followed by channel list. 2558 * Probe request frame, followed by channel list.