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

Commit 6d8e09ee authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: deprecate -8.ucode for 3160 / 7260 / 7265 



This firmware is not supported anymore.
Stop loading this firmware - and remove the code that
handled older versions.

Reviewed-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent b04998f3

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

+4 −4
Original line number Diff line number Diff line
@@ -73,12 +73,12 @@ 
#define IWL3160_UCODE_API_MAX	10



/* Oldest version we won't warn about */

#define IWL7260_UCODE_API_OK	9

#define IWL3160_UCODE_API_OK	9

#define IWL7260_UCODE_API_OK	10

#define IWL3160_UCODE_API_OK	10



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	8

#define IWL3160_UCODE_API_MIN	8

#define IWL7260_UCODE_API_MIN	9

#define IWL3160_UCODE_API_MIN	9



/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d

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

+2 −2
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ 
#define IWL8000_UCODE_API_MAX	10



/* Oldest version we won't warn about */

#define IWL8000_UCODE_API_OK	8

#define IWL8000_UCODE_API_OK	10



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	8

#define IWL8000_UCODE_API_MIN	9



/* NVM versions */

#define IWL8000_NVM_VERSION		0x0a1d

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

+0 −1
Original line number Diff line number Diff line
@@ -337,7 +337,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		hw->flags |= IEEE80211_HW_MFP_CAPABLE;



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&

	    IWL_UCODE_API(mvm->fw->ucode_ver) >= 9 &&

	    !iwlwifi_mod_params.uapsd_disable) {

		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;

		hw->uapsd_queues = IWL_MVM_UAPSD_QUEUES;