lkml.org 
[lkml]   [2012]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 75/75] iwlwifi: use 6000G2B for 6030 device series
    3.3-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Wey-Yi Guy <wey-yi.w.guy@intel.com>

    commit 1ed2ec37b44e86eaa8e0a03b908a39c80f65ee45 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

    Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/wireless/iwlwifi/iwl-6000.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/wireless/iwlwifi/iwl-6000.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
    @@ -351,7 +351,7 @@ static struct iwl_bt_params iwl6000_bt_p
    #define IWL_DEVICE_6005 \
    .fw_name_pre = IWL6005_FW_PRE, \
    .ucode_api_max = IWL6000G2_UCODE_API_MAX, \
    - .ucode_api_ok = IWL6000G2B_UCODE_API_OK, \
    + .ucode_api_ok = IWL6000G2_UCODE_API_OK, \
    .ucode_api_min = IWL6000G2_UCODE_API_MIN, \
    .eeprom_ver = EEPROM_6005_EEPROM_VERSION, \
    .eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION, \
    @@ -391,7 +391,7 @@ struct iwl_cfg iwl6005_2agn_d_cfg = {
    #define IWL_DEVICE_6030 \
    .fw_name_pre = IWL6030_FW_PRE, \
    .ucode_api_max = IWL6000G2_UCODE_API_MAX, \
    - .ucode_api_ok = IWL6000G2_UCODE_API_OK, \
    + .ucode_api_ok = IWL6000G2B_UCODE_API_OK, \
    .ucode_api_min = IWL6000G2_UCODE_API_MIN, \
    .eeprom_ver = EEPROM_6030_EEPROM_VERSION, \
    .eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION, \



    \
     
     \ /
      Last update: 2012-05-04 23:21    [W:0.023 / U:0.536 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site