From ead7297a236119ce4d36bbc599036ca4602dd148 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sun, 4 Jan 2004 20:58:57 -0800 Subject: [PATCH] [NET]: Fix multiple eth0 mixed PCI/ISA init. This patch for 2.6 fixes the problem found by Zoltan Farkas with mixed PCI/ISA and a non-modular config. The problem is the old_netdev ISA probing isn't skipping eth0 which already got assigned by the PCI initialization. --- drivers/net/Space.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/Space.c b/drivers/net/Space.c index ceef07fa3f729..8d2489f6aae56 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c @@ -350,7 +350,7 @@ static int __init ethif_probe(int unit) * Backwards compatibility - historically an I/O base of 1 was * used to indicate not to probe for this ethN interface */ - if (dev->base_addr == 1) { + if (__dev_get_by_name(dev->name) || dev->base_addr == 1) { free_netdev(dev); return -ENXIO; } -- 2.53.0