summaryrefslogtreecommitdiffstats
path: root/net/ethernet/eth.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-06-19 22:45:37 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-06-19 22:45:37 +0000
commit6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch)
tree0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /net/ethernet/eth.c
parentecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff)
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine status unknown.
Diffstat (limited to 'net/ethernet/eth.c')
-rw-r--r--net/ethernet/eth.c34
1 files changed, 14 insertions, 20 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index a1b402672..8209f43aa 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -63,31 +63,25 @@
static int __init eth_setup(char *str)
{
int ints[5];
- struct net_device *d;
+ struct ifmap map;
str = get_options(str, ARRAY_SIZE(ints), ints);
-
if (!str || !*str)
return 0;
- d = dev_base;
- while (d)
- {
- if (!strcmp(str,d->name))
- {
- if (ints[0] > 0)
- d->irq=ints[1];
- if (ints[0] > 1)
- d->base_addr=ints[2];
- if (ints[0] > 2)
- d->mem_start=ints[3];
- if (ints[0] > 3)
- d->mem_end=ints[4];
- break;
- }
- d=d->next;
- }
- return 1;
+ /* Save settings */
+ memset(&map, -1, sizeof(map));
+ if (ints[0] > 0)
+ map.irq = ints[1];
+ if (ints[0] > 1)
+ map.base_addr = ints[2];
+ if (ints[0] > 2)
+ map.mem_start = ints[3];
+ if (ints[0] > 3)
+ map.mem_end = ints[4];
+
+ /* Add new entry to the list */
+ return netdev_boot_setup_add(str, &map);
}
__setup("ether=", eth_setup);