diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-03-30 02:11:44 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-04-13 15:23:12 -0400 |
commit | 536a3eee62fa6b59f9e65723527b1e361c087b9e (patch) | |
tree | 19cb917305daba9a2b910d5aed1eacf0eb73f782 /drivers/net/wireless | |
parent | 3afec63957658d4c0fe5a25636a10b12bde9bad6 (diff) |
iwlwifi: remove IWL_UCODE_TLV_FLAGS_SCHED_SCAN flag
All the supported firmwares have this flag set.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fw.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw.h b/drivers/net/wireless/iwlwifi/iwl-fw.h index fbfdba761560..90d69a2d3c65 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw.h | |||
@@ -83,7 +83,6 @@ | |||
83 | * from the probe request template. | 83 | * from the probe request template. |
84 | * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL: new NS offload (small version) | 84 | * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL: new NS offload (small version) |
85 | * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version) | 85 | * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version) |
86 | * @IWL_UCODE_TLV_FLAGS_SCHED_SCAN: this uCode image supports scheduled scan. | ||
87 | * @IWL_UCODE_TLV_FLAGS_STA_KEY_CMD: new ADD_STA and ADD_STA_KEY command API | 86 | * @IWL_UCODE_TLV_FLAGS_STA_KEY_CMD: new ADD_STA and ADD_STA_KEY command API |
88 | * @IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD: support device wide power command | 87 | * @IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD: support device wide power command |
89 | * containing CAM (Continuous Active Mode) indication. | 88 | * containing CAM (Continuous Active Mode) indication. |
@@ -107,7 +106,6 @@ enum iwl_ucode_tlv_flag { | |||
107 | IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID = BIT(12), | 106 | IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID = BIT(12), |
108 | IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL = BIT(15), | 107 | IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL = BIT(15), |
109 | IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE = BIT(16), | 108 | IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE = BIT(16), |
110 | IWL_UCODE_TLV_FLAGS_SCHED_SCAN = BIT(17), | ||
111 | IWL_UCODE_TLV_FLAGS_STA_KEY_CMD = BIT(19), | 109 | IWL_UCODE_TLV_FLAGS_STA_KEY_CMD = BIT(19), |
112 | IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD = BIT(20), | 110 | IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD = BIT(20), |
113 | IWL_UCODE_TLV_FLAGS_P2P_PM = BIT(21), | 111 | IWL_UCODE_TLV_FLAGS_P2P_PM = BIT(21), |
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index c4557225f46e..8312c03995ee 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -362,14 +362,11 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) | |||
362 | else | 362 | else |
363 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; | 363 | hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; |
364 | 364 | ||
365 | if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) { | 365 | hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; |
366 | hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; | 366 | hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX; |
367 | hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX; | 367 | hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES; |
368 | hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES; | 368 | /* we create the 802.11 header and zero length SSID IE. */ |
369 | /* we create the 802.11 header and zero length SSID IE. */ | 369 | hw->wiphy->max_sched_scan_ie_len = SCAN_OFFLOAD_PROBE_REQ_SIZE - 24 - 2; |
370 | hw->wiphy->max_sched_scan_ie_len = | ||
371 | SCAN_OFFLOAD_PROBE_REQ_SIZE - 24 - 2; | ||
372 | } | ||
373 | 370 | ||
374 | hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN | | 371 | hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN | |
375 | NL80211_FEATURE_P2P_GO_OPPPS; | 372 | NL80211_FEATURE_P2P_GO_OPPPS; |