From: Brice Goglin <brice@myri.com>
Date: Fri, 23 Jun 2006 01:11:59 +0000 (-0400)
Subject: [PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804
X-Git-Tag: v2.6.18-rc1~1081^2~224^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=69eb887b0c2380791d33f7c07bfba88d7c5cef15;p=linux-2.6-omap-h63xx.git

[PATCH] myri10ge - drop workaround for the missing AER ext cap on nVidia CK804

We don't need to hardcode the AER capability of the nVidia CK804 chipset
anymore since commit cf34a8e07f02c76f3f1232eecb681301a3d7b10b (PCI: nVidia
quirk to make AER PCI-E extended capability visible) now makes sure that
this cap will be available to pci_find_ext_capability().

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 1a2b9785e99..5058def3b62 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2251,12 +2251,6 @@ static void myri10ge_enable_ecrc(struct myri10ge_priv *mgp)
 	}
 
 	cap = pci_find_ext_capability(bridge, PCI_EXT_CAP_ID_ERR);
-	/* nvidia ext cap is not always linked in ext cap chain */
-	if (!cap
-	    && bridge->vendor == PCI_VENDOR_ID_NVIDIA
-	    && bridge->device == PCI_DEVICE_ID_NVIDIA_NFORCE_CK804_PCIE)
-		cap = 0x160;
-
 	if (!cap)
 		return;