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;
 	}