aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-core.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2008-06-11 21:47:01 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-14 12:18:06 -0400
commit753f766108158c65ac62cddd26dddcb3f7d9cc3a (patch)
tree9681eee7a822e2d9ff7e3502a045f48d843416b5 /drivers/net/wireless/iwlwifi/iwl-core.c
parent963f55178b25cb673ab438edaae4127b1d014bc1 (diff)
iwlwifi: fix bug when moving from 11gn to 11a or 11an to 11g
It is wrong to set the rxon channel according to the ht-channel in case there is a mismatch (e.g. when there is no ht). Signed-off-by: Guy Cohen <guy.cohen@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c
index fad26f71d7c..7d0a2576d8f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -597,7 +597,6 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info)
597 IWL_DEBUG_ASSOC("control diff than current %d %d\n", 597 IWL_DEBUG_ASSOC("control diff than current %d %d\n",
598 le16_to_cpu(rxon->channel), 598 le16_to_cpu(rxon->channel),
599 ht_info->control_channel); 599 ht_info->control_channel);
600 rxon->channel = cpu_to_le16(ht_info->control_channel);
601 return; 600 return;
602 } 601 }
603 602