Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c13b1725 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

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: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 748fa67c

drivers/net/wireless/iwlwifi/iwl-7000.c

+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ 
#define IWL3160_UCODE_API_OK	8



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	7

#define IWL3160_UCODE_API_MIN	7

#define IWL7260_UCODE_API_MIN	8

#define IWL3160_UCODE_API_MIN	8



/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d

drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c

+1 −4
Original line number Diff line number Diff line
@@ -667,12 +667,9 @@ static void iwl_mvm_mac_ctxt_cmd_common(struct iwl_mvm *mvm, 
	if (vif->bss_conf.qos)

		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) {

		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",

		       vif->bss_conf.use_cts_prot,

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+2 −5
Original line number Diff line number Diff line
@@ -309,11 +309,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		BIT(NL80211_IFTYPE_P2P_CLIENT) |

		BIT(NL80211_IFTYPE_AP) |

		BIT(NL80211_IFTYPE_P2P_GO) |

		BIT(NL80211_IFTYPE_P2P_DEVICE);



	/* IBSS has bugs in older versions */

	if (IWL_UCODE_API(mvm->fw->ucode_ver) >= 8)

		hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);

		BIT(NL80211_IFTYPE_P2P_DEVICE) |

		BIT(NL80211_IFTYPE_ADHOC);



	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;

	hw->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG |

drivers/net/wireless/iwlwifi/mvm/sf.c

+0 −3
Original line number Diff line number Diff line
@@ -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,

	};



	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

	 * vif is a p2p device.