[Trusty][PATCH] iwlwifi: 7000: bump firmware API version to 9

[Adam Lee]

Cc Emmanuel Grumbach.

Hi, Emmanuel

BugLink: https://bugs.launchpad.net/bugs/1393317

I'm fixing the disconnecting issue of latest 7625 wireless adapter in
Ubuntu, it needs the latest firmware, so I wanna bump the firmware
version to 9 in Ubuntu 14.04. But I'm not sure if it's OK to simply bump
the version but not upgrade the iwlwifi driver to latest, especially
3160 and 7260's firmware version will also be bumped by this patch,
could you please review it?

Great thanks.

On Mon, Nov 17, 2014 at 04:34:58PM +0800, Adam Lee wrote:
> From: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1393317
> 
> Also warn if an older firmware is loaded.
> 
> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
> (back ported from commit f0d5bb07a3765e086e6ff5e397b13616e6883d04)
> Signed-off-by: Adam Lee <adam.lee at canonical.com>
> 
> Conflicts:
> 	drivers/net/wireless/iwlwifi/iwl-7000.c
> ---
>  drivers/net/wireless/iwlwifi/iwl-7000.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/wireless/iwlwifi/iwl-7000.c b/drivers/net/wireless/iwlwifi/iwl-7000.c
> index ee02c3b..c3dc880 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-7000.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
> @@ -67,12 +67,12 @@
>  #include "iwl-agn-hw.h"
>  
>  /* Highest firmware API version supported */
> -#define IWL7260_UCODE_API_MAX	8
> -#define IWL3160_UCODE_API_MAX	8
> +#define IWL7260_UCODE_API_MAX	9
> +#define IWL3160_UCODE_API_MAX	9
>  
>  /* Oldest version we won't warn about */
> -#define IWL7260_UCODE_API_OK	7
> -#define IWL3160_UCODE_API_OK	7
> +#define IWL7260_UCODE_API_OK	9
> +#define IWL3160_UCODE_API_OK	9
>  
>  /* Lowest firmware API version supported */
>  #define IWL7260_UCODE_API_MIN	7
> -- 
> 2.1.3
> 

-- 
Adam Lee