Commit 6b9b3438 authored May 05, 2008 by Tomas Winkler Committed by John W. Linville May 14, 2008

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>

parent 5a835353

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}