From 304dba6326bbe618226a10e48d6fa0fed6c8572e Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Mon, 5 May 2008 10:22:30 +0800 Subject: [PATCH] --- yaml --- r: 102547 b: refs/heads/master c: 6b9b34389c2fdb8618fe2c686b6872d26562fd07 h: refs/heads/master i: 102545: 75c6a4d5734d6f8af81f51093381fd87bd0c732a 102543: 7c9bf42befc8c235c62fdbb0c4b9a5f3b6f804dd v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c0391f43dc15..ab56c8f7f0ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a835353fb3c68a3da3badcc485614cdfc6e6109 +refs/heads/master: 6b9b34389c2fdb8618fe2c686b6872d26562fd07 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c index 773bb3229cfe..6eca75717f31 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/trunk/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; }