Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / iwlwifi / iwl-4965.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index ead947b4d3036db98286e25035c7099be6c612f6..bd0140be774e4320435850b2095dcbc78a7c462b 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -381,21 +381,11 @@ out:
 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 */