aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-dev.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-04-20 12:10:39 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-04-30 11:40:14 -0400
commitd2690c0db7146b12e4fc2d572053c823e512758a (patch)
treefc8254556fa4adb4f737a3b5f41f346fe2fa90d3 /drivers/net/wireless/iwlwifi/iwl-dev.h
parentc1821c95c13240c2c8d3da8845c2021e575e29c6 (diff)
iwlagn: use proper good CRC threshold behaviour
New microcode versions use the good CRC threshold field differently, as a flag, and in that case we should set it to 1/0 instead of 1/65535 for an active/passive scan. The new behaviour is advertised by the uCode with a feature flag. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-dev.h')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 197fa742f79a..f098eff263f8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -547,12 +547,13 @@ enum iwl_ucode_tlv_type {
547 * enum iwl_ucode_tlv_flag - ucode API flags 547 * enum iwl_ucode_tlv_flag - ucode API flags
548 * @IWL_UCODE_TLV_FLAGS_PAN: This is PAN capable microcode; this previously 548 * @IWL_UCODE_TLV_FLAGS_PAN: This is PAN capable microcode; this previously
549 * was a separate TLV but moved here to save space. 549 * was a separate TLV but moved here to save space.
550 * @IWL_UCODE_TLV_FLAGS_RESERVED_1: reserved 550 * @IWL_UCODE_TLV_FLAGS_NEWSCAN: new uCode scan behaviour on hidden SSID,
551 * treats good CRC threshold as a boolean
551 * @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w). 552 * @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).
552 */ 553 */
553enum iwl_ucode_tlv_flag { 554enum iwl_ucode_tlv_flag {
554 IWL_UCODE_TLV_FLAGS_PAN = BIT(0), 555 IWL_UCODE_TLV_FLAGS_PAN = BIT(0),
555 IWL_UCODE_TLV_FLAGS_RESERVED_1 = BIT(1), 556 IWL_UCODE_TLV_FLAGS_NEWSCAN = BIT(1),
556 IWL_UCODE_TLV_FLAGS_MFP = BIT(2), 557 IWL_UCODE_TLV_FLAGS_MFP = BIT(2),
557}; 558};
558 559
@@ -1263,6 +1264,8 @@ struct iwl_priv {
1263 /* max number of station keys */ 1264 /* max number of station keys */
1264 u8 sta_key_max_num; 1265 u8 sta_key_max_num;
1265 1266
1267 bool new_scan_threshold_behaviour;
1268
1266 /* EEPROM MAC addresses */ 1269 /* EEPROM MAC addresses */
1267 struct mac_address addresses[2]; 1270 struct mac_address addresses[2];
1268 1271