lkml.org 
[lkml]   [2010]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[017/139] iwlwifi: fix regulatory
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

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

    From: Reinette Chatre <reinette.chatre@intel.com>

    commit f6c8f1523a2de3b84340e45913cbcee8bee74570 upstream.

    Commit "cfg80211: convert bools into flags" mistakenly modified iwlwifi's
    regulatory settings instead of just converting it. Fix this.

    This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2172

    Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +-
    drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
    +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
    @@ -2461,7 +2461,7 @@ static int iwl_setup_mac(struct iwl_priv
    BIT(NL80211_IFTYPE_STATION) |
    BIT(NL80211_IFTYPE_ADHOC);

    - hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY |
    + hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
    WIPHY_FLAG_DISABLE_BEACON_HINTS;

    /*
    --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
    +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
    @@ -3903,7 +3903,7 @@ static int iwl3945_setup_mac(struct iwl_
    BIT(NL80211_IFTYPE_STATION) |
    BIT(NL80211_IFTYPE_ADHOC);

    - hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY |
    + hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
    WIPHY_FLAG_DISABLE_BEACON_HINTS;

    hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX_3945;



    \
     
     \ /
      Last update: 2010-04-22 22:33    [W:0.018 / U:31.764 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site