---

yaml --- r: 134506 b: refs/heads/master c: 24566f4 h: refs/heads/master v: v3
git-mirror · Feb 13, 2009 · e32568a · e32568a
1 parent fae3891
commit e32568a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fdb68de22c9881691c485b05ed3204bdc431a18
+refs/heads/master: 24566f4a15e2626cfaf2854057b636ef40ee8481
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -381,21 +381,11 @@ static int iwl4965_apm_init(struct iwl_priv *priv)
 static void iwl4965_nic_config(struct iwl_priv *priv)
 {
 	unsigned long flags;
-	u16 dctl;
 	u16 radio_cfg;
 	u16 lctl;
 
 	spin_lock_irqsave(&priv->lock, flags);
 
-	if ((priv->rev_id & 0x80) == 0x80 && (priv->rev_id & 0x7f) < 8) {
-		int pos = pci_find_capability(priv->pci_dev, PCI_CAP_ID_EXP);
-		pci_read_config_word(priv->pci_dev, pos + PCI_EXP_DEVCTL, &dctl);
-
-		/* Enable No Snoop field */
-		pci_write_config_word(priv->pci_dev, pos + PCI_EXP_DEVCTL,
-					dctl & ~PCI_EXP_DEVCTL_NOSNOOP_EN);
-	}
-
 	lctl = iwl_pcie_link_ctl(priv);
 
 	/* HW bug W/A - negligible power consumption */