diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-02-26 09:40:56 -0500 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-12 03:57:33 -0400 |
commit | 0ec850dc194586398242d3fa590720f737b5f088 (patch) | |
tree | c845d8fcfa1142a248f69d215533490853b6e6ca | |
parent | 767d6f9d43b4ebe97cc5dc7b7b2cdb5e57b82288 (diff) |
iwlwifi: mvm: remove IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF
All the supported firmwares support this API.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sf.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h index 489bda4ec231..e5fd19d8fc30 100644 --- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h +++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h | |||
@@ -240,7 +240,6 @@ enum iwl_ucode_tlv_flag { | |||
240 | /** | 240 | /** |
241 | * enum iwl_ucode_tlv_api - ucode api | 241 | * enum iwl_ucode_tlv_api - ucode api |
242 | * @IWL_UCODE_TLV_API_BT_COEX_SPLIT: new API for BT Coex | 242 | * @IWL_UCODE_TLV_API_BT_COEX_SPLIT: new API for BT Coex |
243 | * @IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF: ucode supports disabling dummy notif. | ||
244 | * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time | 243 | * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time |
245 | * longer than the passive one, which is essential for fragmented scan. | 244 | * longer than the passive one, which is essential for fragmented scan. |
246 | * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source. | 245 | * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source. |
@@ -258,7 +257,6 @@ enum iwl_ucode_tlv_flag { | |||
258 | */ | 257 | */ |
259 | enum iwl_ucode_tlv_api { | 258 | enum iwl_ucode_tlv_api { |
260 | IWL_UCODE_TLV_API_BT_COEX_SPLIT = BIT(3), | 259 | IWL_UCODE_TLV_API_BT_COEX_SPLIT = BIT(3), |
261 | IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF = BIT(7), | ||
262 | IWL_UCODE_TLV_API_FRAGMENTED_SCAN = BIT(8), | 260 | IWL_UCODE_TLV_API_FRAGMENTED_SCAN = BIT(8), |
263 | IWL_UCODE_TLV_API_WIFI_MCC_UPDATE = BIT(9), | 261 | IWL_UCODE_TLV_API_WIFI_MCC_UPDATE = BIT(9), |
264 | IWL_UCODE_TLV_API_HDC_PHASE_0 = BIT(10), | 262 | IWL_UCODE_TLV_API_HDC_PHASE_0 = BIT(10), |
diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c index 7eb78e2c240a..4b9f6c6fb614 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sf.c +++ b/drivers/net/wireless/iwlwifi/mvm/sf.c | |||
@@ -179,8 +179,7 @@ static int iwl_mvm_sf_config(struct iwl_mvm *mvm, u8 sta_id, | |||
179 | struct ieee80211_sta *sta; | 179 | struct ieee80211_sta *sta; |
180 | int ret = 0; | 180 | int ret = 0; |
181 | 181 | ||
182 | if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF && | 182 | if (mvm->cfg->disable_dummy_notification) |
183 | mvm->cfg->disable_dummy_notification) | ||
184 | sf_cmd.state |= cpu_to_le32(SF_CFG_DUMMY_NOTIF_OFF); | 183 | sf_cmd.state |= cpu_to_le32(SF_CFG_DUMMY_NOTIF_OFF); |
185 | 184 | ||
186 | /* | 185 | /* |