lkml.org 
[lkml]   [2011]   [Jan]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 043/260] ath9k_hw: fix parsing of HT40 5 GHz CTLs
    Date
    From: Luis R. Rodriguez <lrodriguez@atheros.com>

    commit 904879748d7439a6dabdc6be9aad983e216b027d upstream.

    The 5 GHz CTL indexes were not being read for all hardware
    devices due to the masking out through the CTL_MODE_M mask
    being one bit too short. Without this the calibrated regulatory
    maximum values were not being picked up when devices operate
    on 5 GHz in HT40 mode. The final output power used for Atheros
    devices is the minimum between the calibrated CTL values and
    what CRDA provides.

    Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/net/wireless/ath/ath9k/eeprom.h | 2 +-
    drivers/net/wireless/ath/regd.h | 1 -
    2 files changed, 1 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h
    index 2f2993b..104e3ea 100644
    --- a/drivers/net/wireless/ath/ath9k/eeprom.h
    +++ b/drivers/net/wireless/ath/ath9k/eeprom.h
    @@ -61,7 +61,7 @@

    #define SD_NO_CTL 0xE0
    #define NO_CTL 0xff
    -#define CTL_MODE_M 7
    +#define CTL_MODE_M 0xf
    #define CTL_11A 0
    #define CTL_11B 1
    #define CTL_11G 2
    diff --git a/drivers/net/wireless/ath/regd.h b/drivers/net/wireless/ath/regd.h
    index a1c3952..345dd97 100644
    --- a/drivers/net/wireless/ath/regd.h
    +++ b/drivers/net/wireless/ath/regd.h
    @@ -31,7 +31,6 @@ enum ctl_group {
    #define NO_CTL 0xff
    #define SD_NO_CTL 0xE0
    #define NO_CTL 0xff
    -#define CTL_MODE_M 7
    #define CTL_11A 0
    #define CTL_11B 1
    #define CTL_11G 2
    --
    1.7.3.3


    \
     
     \ /
      Last update: 2011-01-02 09:09    [W:4.173 / U:0.776 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site