iwlwifi: mvm: deprecate -7 firmware
This firmware is not supported any more. A few code paths specific to old firmware can be removed. We can now assume that a few TLV flags are always set since we won't load firmware that didn't support the corresponding features. This will be done in a separate patch. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
This commit is contained in:
Родитель
748fa67cb7
Коммит
c13b172559
|
@ -75,8 +75,8 @@
|
||||||
#define IWL3160_UCODE_API_OK 8
|
#define IWL3160_UCODE_API_OK 8
|
||||||
|
|
||||||
/* Lowest firmware API version supported */
|
/* Lowest firmware API version supported */
|
||||||
#define IWL7260_UCODE_API_MIN 7
|
#define IWL7260_UCODE_API_MIN 8
|
||||||
#define IWL3160_UCODE_API_MIN 7
|
#define IWL3160_UCODE_API_MIN 8
|
||||||
|
|
||||||
/* NVM versions */
|
/* NVM versions */
|
||||||
#define IWL7260_NVM_VERSION 0x0a1d
|
#define IWL7260_NVM_VERSION 0x0a1d
|
||||||
|
|
|
@ -667,12 +667,9 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm,
|
||||||
if (vif->bss_conf.qos)
|
if (vif->bss_conf.qos)
|
||||||
cmd->qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);
|
cmd->qos_flags |= cpu_to_le32(MAC_QOS_FLG_UPDATE_EDCA);
|
||||||
|
|
||||||
/* Don't use cts to self as the fw doesn't support it currently. */
|
|
||||||
if (vif->bss_conf.use_cts_prot) {
|
if (vif->bss_conf.use_cts_prot) {
|
||||||
cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT);
|
cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_TGG_PROTECT);
|
||||||
if (IWL_UCODE_API(mvm->fw->ucode_ver) >= 8)
|
cmd->protection_flags |= cpu_to_le32(MAC_PROT_FLG_SELF_CTS_EN);
|
||||||
cmd->protection_flags |=
|
|
||||||
cpu_to_le32(MAC_PROT_FLG_SELF_CTS_EN);
|
|
||||||
}
|
}
|
||||||
IWL_DEBUG_RATE(mvm, "use_cts_prot %d, ht_operation_mode %d\n",
|
IWL_DEBUG_RATE(mvm, "use_cts_prot %d, ht_operation_mode %d\n",
|
||||||
vif->bss_conf.use_cts_prot,
|
vif->bss_conf.use_cts_prot,
|
||||||
|
|
|
@ -309,11 +309,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
|
||||||
BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
||||||
BIT(NL80211_IFTYPE_AP) |
|
BIT(NL80211_IFTYPE_AP) |
|
||||||
BIT(NL80211_IFTYPE_P2P_GO) |
|
BIT(NL80211_IFTYPE_P2P_GO) |
|
||||||
BIT(NL80211_IFTYPE_P2P_DEVICE);
|
BIT(NL80211_IFTYPE_P2P_DEVICE) |
|
||||||
|
BIT(NL80211_IFTYPE_ADHOC);
|
||||||
/* IBSS has bugs in older versions */
|
|
||||||
if (IWL_UCODE_API(mvm->fw->ucode_ver) >= 8)
|
|
||||||
hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
|
|
||||||
|
|
||||||
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
|
hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
|
||||||
hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
|
hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |
|
||||||
|
|
|
@ -237,9 +237,6 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif,
|
||||||
.sta_vif_ap_sta_id = IWL_MVM_STATION_COUNT,
|
.sta_vif_ap_sta_id = IWL_MVM_STATION_COUNT,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (IWL_UCODE_API(mvm->fw->ucode_ver) < 8)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ignore the call if we are in HW Restart flow, or if the handled
|
* Ignore the call if we are in HW Restart flow, or if the handled
|
||||||
* vif is a p2p device.
|
* vif is a p2p device.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче