Multiple ethernets & 2.0.3x

Philip Gladstone (philip@raptor.com)
Wed, 15 Jul 1998 13:15:14 -0400


This is a multi-part message in MIME format.
--------------0B9FC01CCE0100C09E127CD0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Attached is a small patch that changes the way that PCI ethernet
cards are initialized. The result of this change is that *all*
the PCI ethernet cards in the box are initialized, rather than all
the ethernet cards of one type.

This reduces the hassles associated with adding extra
parameters onto the boot line.

Philip

-- 
Philip Gladstone                           +1 781 530 2461
Raptor Systems / Axent Technologies 
Waltham, MA         		    http://www.raptor.com/
--------------0B9FC01CCE0100C09E127CD0
Content-Type: text/plain; charset=us-ascii; name="all_pci.pf"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="all_pci.pf"

--- linux/drivers/net/Space.c.orig Tue Jul 14 15:03:47 1998 +++ linux/drivers/net/Space.c Tue Jul 14 17:00:33 1998 @@ -93,6 +93,8 @@ extern int de600_probe(struct device *); extern int de620_probe(struct device *); +#define CHECK_INIT_DEV(x) ((x) ? -1 : (int) (dev = 0)) + static int ethif_probe(struct device *dev) { @@ -101,41 +103,42 @@ if ((base_addr == 0xffe0) || (base_addr == 1)) return 1; /* ENXIO */ - if (1 + if (1 && (-1 /* All PCI probes are safe, and thus should be first. */ #ifdef CONFIG_DE4X5 /* DEC DE425, DE434, DE435 adapters */ - && de4x5_probe(dev) + & CHECK_INIT_DEV(de4x5_probe(dev)) #endif #ifdef CONFIG_DGRS - && dgrs_probe(dev) + & CHECK_INIT_DEV(dgrs_probe(dev)) #endif #ifdef CONFIG_EEXPRESS_PRO100B /* Intel EtherExpress Pro100B */ - && eepro100_probe(dev) + & CHECK_INIT_DEV(eepro100_probe(dev)) #endif #ifdef CONFIG_EPIC - && epic100_probe(dev) + & CHECK_INIT_DEV(epic100_probe(dev)) #endif #if defined(CONFIG_HP100) - && hp100_probe(dev) + & CHECK_INIT_DEV(hp100_probe(dev)) #endif #if defined(CONFIG_NE2K_PCI) - && ne2k_pci_probe(dev) + & CHECK_INIT_DEV(ne2k_pci_probe(dev)) #endif #ifdef CONFIG_PCNET32 - && pcnet32_probe(dev) + & CHECK_INIT_DEV(pcnet32_probe(dev)) #endif #ifdef CONFIG_RTL8139 - && rtl8139_probe(dev) + & CHECK_INIT_DEV(rtl8139_probe(dev)) #endif #if defined(CONFIG_VORTEX) - && tc59x_probe(dev) + & CHECK_INIT_DEV(tc59x_probe(dev)) #endif #if defined(CONFIG_DEC_ELCP) - && tulip_probe(dev) + & CHECK_INIT_DEV(tulip_probe(dev)) #endif #ifdef CONFIG_YELLOWFIN - && yellowfin_probe(dev) + & CHECK_INIT_DEV(yellowfin_probe(dev)) #endif + ) /* Next mostly-safe EISA-only drivers. */ #ifdef CONFIG_AC3200 /* Ansel Communications EISA 3200. */ && ac3200_probe(dev)

--------------0B9FC01CCE0100C09E127CD0--

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.altern.org/andrebalsa/doc/lkml-faq.html