mac80211: unify config_interface and bss_info_changed

[~andy/linux] / drivers / net / wireless / iwlwifi / iwl-commands.h

diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 29d40746da6a3112c34cb3997d4788607a6b2744..7b84d5246b363a3c0eed3e98f1c89f622cd5c7fa 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -2469,11 +2469,12 @@ struct iwl_ssid_ie {
        u8 ssid[32];
 } __attribute__ ((packed));
 
-#define PROBE_OPTION_MAX_API1          0x4
-#define PROBE_OPTION_MAX               0x14
+#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_MAX_SCAN_SIZE 1024
+#define IWL_MAX_PROBE_REQUEST          200
 
 /*
  * REPLY_SCAN_CMD = 0x80 (command)
@@ -2552,7 +2553,7 @@ struct iwl3945_scan_cmd {
        struct iwl3945_tx_cmd tx_cmd;
 
        /* For directed active scans (set to all-0s otherwise) */
-       struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX_API1];
+       struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX_3945];
 
        /*
         * Probe request frame, followed by channel list.