diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 22:05:51 +0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 22:05:51 +0400 |
commit | fda87903f4e9caf87e02d52768c2611e417b7efb (patch) | |
tree | bd2f84361699651cce5661bcfe60e3fe5ee91517 /drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | |
parent | 1a0703ede4493bd74f9c6b53f782b749e175a88e (diff) | |
parent | 2de0dbc5f6830e7659083d1929f57cb88b16a3b6 (diff) | |
download | linux-fda87903f4e9caf87e02d52768c2611e417b7efb.tar.xz |
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next
Conflicts:
drivers/gpio/gpio-pl061.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-rxon.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index a7a6def40d05..5c7c17c7166a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -606,8 +606,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed) if (ctx->ht.enabled) { /* if HT40 is used, it should not change * after associated except channel switch */ - if (iwl_is_associated_ctx(ctx) && - !ctx->ht.is_40mhz) + if (!ctx->ht.is_40mhz || + !iwl_is_associated_ctx(ctx)) iwlagn_config_ht40(conf, ctx); } else ctx->ht.is_40mhz = false; |