lkml.org 
[lkml]   [2012]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [ 05/91] iwlwifi: use 6000G2B for 6030 device series
From
Date
On Sun, 2012-05-27 at 09:25 +0900, Greg KH wrote:
> 3.4-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
>
> commit 35e7adaaf6932c5ffb22c6ec521734434c65adc5 upstream.
>
> "iwlwifi: use correct released ucode version" change
> the ucode api ok from 6000G2 to 6000G2B, but it shall belong
> to 6030 device series, not the 6005 device series. Fix it

The relevant changes are:

(a)
commit e377a4fc768d7d477e58888bdbddd0103d6238bf
Author: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Date: Sun Apr 22 07:55:27 2012 -0700
iwlwifi: use correct released ucode version

- changed IWL_DEVICE_6005 to use IWL6000G2B_UCODE_API_OK
- upstream in this merge window; not cc'd to stable; redundant with next change

(b)
commit 78cbcf2b9dbe0565820dc7721316f9c401000a68
Author: Meenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Date: Sun Apr 22 07:55:27 2012 -0700

iwlwifi: use correct released ucode version

- changed IWL_DEVICE_6005 to use IWL6000G2B_UCODE_API_OK (among many other changes)
- upstream in 3.4; cc'd to stable; applied in 3.2.17 and 3.3.5

(c)
commit 35e7adaaf6932c5ffb22c6ec521734434c65adc5
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Wed Apr 25 08:10:08 2012 -0700

iwlwifi: use 6000G2B for 6030 device series

- changed IWL_DEVICE_6005 back to IWL6000G2_UCODE_API_OK
- upstream in this merge window; cc'd to stable; redundant with next change

(d)
commit 1ed2ec37b44e86eaa8e0a03b908a39c80f65ee45
Author: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Wed Apr 25 08:10:08 2012 -0700

iwlwifi: use 6000G2B for 6030 device series

- changed IWL_DEVICE_6005 back to IWL6000G2_UCODE_API_OK and IWL_DEVICE_6030 to IWL6000G2B_UCODE_API_OK
- upstream in 3.4; cc'd to stable; applied in 3.2.17 and 3.3.5

We have applied (b) and (d); (a) and (c) are thus redundant.

This is (a) but applied in the wrong place; the next patch (06/91) is
(c) but applied in the wrong place; together they are reverting the
effect of (d)).

Ben.

--
Ben Hutchings
The obvious mathematical breakthrough [to break modern encryption] would be
development of an easy way to factor large prime numbers. - Bill Gates
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-05-27 15:41    [from the cache]
©2003-2011 Jasper Spaans