APPLIED: [Trusty][PATCH 1/5] iwlwifi: 7000: bump firmware API version to 9

[Brad Figg]

On 11/21/2014 12:16 AM, 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
> 


-- 
Brad Figg brad.figg at canonical.com http://www.canonical.com