Commit ead7297a authored by Stephen Hemminger's avatar Stephen Hemminger

[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.
parent 5d61282c
...@@ -350,7 +350,7 @@ static int __init ethif_probe(int unit) ...@@ -350,7 +350,7 @@ static int __init ethif_probe(int unit)
* Backwards compatibility - historically an I/O base of 1 was * Backwards compatibility - historically an I/O base of 1 was
* used to indicate not to probe for this ethN interface * 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); free_netdev(dev);
return -ENXIO; return -ENXIO;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment