]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
iwlwifi: don't override association channel with control channel
authorTomas Winkler <tomas.winkler@intel.com>
Mon, 5 May 2008 02:22:30 +0000 (10:22 +0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 May 2008 20:29:39 +0000 (16:29 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-4965.c

index 773bb3229cfea788398b111c8cc670e45d180516..6eca75717f31a8103f1511f4c2325602c02775dc 100644 (file)
@@ -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;
        }