aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-05-05 10:22:30 +0800
committerJohn W. Linville <linville@tuxdriver.com>2008-05-14 16:29:39 -0400
commit6b9b34389c2fdb8618fe2c686b6872d26562fd07 (patch)
treefd9939b7b58eb8d703892d71a092bf89c858a3cc /drivers/net/wireless
parent5a835353fb3c68a3da3badcc485614cdfc6e6109 (diff)
iwlwifi: don't override association channel with control channel
This patch fixes override of association channel with HT control channel. The scenario is currently happening because disassociation flow doesn't clean previous association information (such as is_ht and control channel). Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 773bb3229cf..6eca75717f3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -3775,10 +3775,10 @@ void iwl4965_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_info *ht_info)
RXON_FLG_CHANNEL_MODE_PURE_40_MSK);
if (le16_to_cpu(rxon->channel) != ht_info->control_channel) {
- IWL_DEBUG_ASSOC("control diff than current %d %d\n",
+ IWL_ERROR("control diff than current %d %d\n",
le16_to_cpu(rxon->channel),
ht_info->control_channel);
- rxon->channel = cpu_to_le16(ht_info->control_channel);
+ WARN_ON(1);
return;
}