patch-2.1.105 linux/drivers/net/lance.c

• Lines: 31
• Date: Sun Jun 7 10:16:57 1998
• Orig file: v2.1.104/linux/drivers/net/lance.c
• Orig date: Mon Apr 6 17:41:00 1998

diff -u --recursive --new-file v2.1.104/linux/drivers/net/lance.c linux/drivers/net/lance.c
@@ -276,6 +276,12 @@
         {0x2621, "PCnet/PCI-II 79C970A",        /* 79C970A PCInetPCI II. */
                 LANCE_ENABLE_AUTOSELECT + LANCE_MUST_REINIT_RING +
                         LANCE_HAS_MISSED_FRAME + PCNET32_POSSIBLE},
+        {0x2623, "PCnet/FAST 79C971",        /* 79C971 PCInetFAST. */
+                LANCE_ENABLE_AUTOSELECT + LANCE_MUST_REINIT_RING +
+                        LANCE_HAS_MISSED_FRAME + PCNET32_POSSIBLE},
+        {0x2624, "PCnet/FAST+ 79C972",       /* 79C972 PCInetFAST+. */
+                LANCE_ENABLE_AUTOSELECT + LANCE_MUST_REINIT_RING +
+                        LANCE_HAS_MISSED_FRAME + PCNET32_POSSIBLE},
 	{0x0, 	 "PCnet (unknown)",
 		LANCE_ENABLE_AUTOSELECT + LANCE_MUST_REINIT_RING +
 			LANCE_HAS_MISSED_FRAME},
@@ -315,7 +321,7 @@
 	if (virt_to_bus(high_memory) <= 16*1024*1024)
 		lance_need_isa_bounce_buffers = 0;
 
-#if defined(CONFIG_PCI) && !defined(CONFIG_PCNET32)
+#if defined(CONFIG_PCI) && !(defined(CONFIG_PCNET32) || defined(CONFIG_PCNET32_MODULE))
     if (pci_present()) {
 	    struct pci_dev *pdev = NULL;
 		if (lance_debug > 1)
@@ -421,7 +427,7 @@
 		}
 	}
     
-#ifdef CONFIG_PCNET32
+#if defined(CONFIG_PCNET32) || defined (CONFIG_PCNET32_MODULE)
         /*
 	 * if pcnet32 is configured and the chip is capable of 32bit mode
 	 * leave the card alone