From: Tomas Hruby <thruby@few.vu.nl>
Date: Thu, 7 Jul 2011 17:26:39 +0000 (+0000)
Subject: E1000 - pci probing
X-Git-Tag: v3.2.0~476
X-Git-Url: http://zhaoyanbai.com/repos/icons/debian/static/man.7.txt?a=commitdiff_plain;h=6dea092dece25c8b275b3ee00dee9f4a332413cf;p=minix.git

E1000 - pci probing

- once we know it is not an Intel device, it is not a match
---

diff --git a/drivers/e1000/e1000.c b/drivers/e1000/e1000.c
index 90235f0ff..c6ffb2ca6 100644
--- a/drivers/e1000/e1000.c
+++ b/drivers/e1000/e1000.c
@@ -250,11 +250,13 @@ PRIVATE int e1000_probe(e1000_t *e, int skip)
     /* Loop devices on the PCI bus. */
     for(;;)
     {
+	E1000_DEBUG(3, ("%s: probe() devind %d vid 0x%x did 0x%x\n",
+				e->name, devind, vid, did));
+	if (vid != 0x8086)
+		goto get_next;
+
 	for (i = 0; pcitab_e1000[i] != 0; i++)
 	{
-	    if (vid != 0x8086)
-		continue;
-	
 	    if (did != pcitab_e1000[i])
 		continue;
 	    else
@@ -267,6 +269,7 @@ PRIVATE int e1000_probe(e1000_t *e, int skip)
 	    skip--;
 	}
 
+get_next:
 	if (!(r = pci_next_dev(&devind, &vid, &did)))
 	{
 	    return FALSE;