---

yaml --- r: 314235 b: refs/heads/master c: 12b7824 h: refs/heads/master i: 314233: 9ebce3a 314231: d5994e5 v: v3
git-mirror · Jun 6, 2012 · dc83f66 · dc83f66
1 parent abfd45f
commit dc83f66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de4902ee8e07252d335b16810cb73432cf0d514
+refs/heads/master: 12b78246aa49b72f665601fdc7a44eb75fcf593b
diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/devices.c b/trunk/drivers/net/wireless/iwlwifi/dvm/devices.c
@@ -96,10 +96,7 @@ static void iwl1000_set_ct_threshold(struct iwl_priv *priv)
 /* NIC configuration for 1000 series */
 static void iwl1000_nic_config(struct iwl_priv *priv)
 {
-	/* set CSR_HW_CONFIG_REG for uCode use */
-	iwl_set_bit(priv->trans, CSR_HW_IF_CONFIG_REG,
-		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |
-		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
+	iwl_rf_config(priv);
 
 	/* Setting digital SVR for 1000 card to 1.32V */
 	/* locking is acquired in iwl_set_bits_mask_prph() function */