diff options
author | Matthew Whitehead <tedheadster@gmail.com> | 2013-04-29 17:46:53 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-30 15:32:49 -0400 |
commit | 3b54912f9cd167641b91d4a697bd742f70e534fe (patch) | |
tree | 149e7ecb76b5f7d3c67c95446a55903fa0c2e65b | |
parent | 32e192721a4d28102f8a31638d46dee63ac03bcd (diff) |
3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)
The venerable 3c509 driver only sets its device parent in one case, the ISAPnP one.
It does this with the SET_NETDEV_DEV function. It should register with the device
hierarchy in two additional cases: standard (non-PnP) ISA and EISA.
- Currently they appear here:
/sys/devices/virtual/net/eth0 (standard ISA)
/sys/devices/virtual/net/eth1 (EISA)
- Rather, they should instead be here:
/sys/devices/isa/3c509.0/net/eth0 (standard ISA)
/sys/devices/pci0000:00/0000:00:07.0/00:04/net/eth1 (EISA)
Tested on ISA and EISA boards.
Signed-off-by: Matthew Whitehead <tedheadster@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/3com/3c509.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c index f36ff99fd394..adb4bf5eb4b4 100644 --- a/drivers/net/ethernet/3com/3c509.c +++ b/drivers/net/ethernet/3com/3c509.c | |||
@@ -306,6 +306,7 @@ static int el3_isa_match(struct device *pdev, unsigned int ndev) | |||
306 | if (!dev) | 306 | if (!dev) |
307 | return -ENOMEM; | 307 | return -ENOMEM; |
308 | 308 | ||
309 | SET_NETDEV_DEV(dev, pdev); | ||
309 | netdev_boot_setup_check(dev); | 310 | netdev_boot_setup_check(dev); |
310 | 311 | ||
311 | if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-isa")) { | 312 | if (!request_region(ioaddr, EL3_IO_EXTENT, "3c509-isa")) { |
@@ -595,6 +596,7 @@ static int __init el3_eisa_probe (struct device *device) | |||
595 | return -ENOMEM; | 596 | return -ENOMEM; |
596 | } | 597 | } |
597 | 598 | ||
599 | SET_NETDEV_DEV(dev, device); | ||
598 | netdev_boot_setup_check(dev); | 600 | netdev_boot_setup_check(dev); |
599 | 601 | ||
600 | el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_EISA); | 602 | el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_EISA); |