diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:00:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:00:07 -0800 |
| commit | c37b3aca314d94297b0f6ce1fefdf18d8d6cece6 (patch) | |
| tree | 32f56433d55616eb1decc95df2b525cc2455b4fb /net/core/dev.c | |
| parent | 6db68906c1bb26066a32c8e5be0c523da41cf08f (diff) | |
v2.4.2 -> v2.4.2.1
- Chris Mason: reiserfs, another null bytes bug
- Andrea Arkangeli: make SMP Athlon build
- Alexander Zarochentcev: reiserfs directory fsync SMP locking fix
- Jeff Garzik: PCI network driver updates
- Alan Cox: continue merging
- Ingo Molnar: fix RAID AUTORUN ioctl, scheduling improvements
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index cf4dcf8cd022..3276ee10efa6 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -349,7 +349,7 @@ int netdev_boot_setup_check(struct net_device *dev) /* * Saves at boot time configured settings for any netdevice. */ -static int __init netdev_boot_setup(char *str) +int __init netdev_boot_setup(char *str) { int ints[5]; struct ifmap map; @@ -359,7 +359,7 @@ static int __init netdev_boot_setup(char *str) return 0; /* Save settings */ - memset(&map, -1, sizeof(map)); + memset(&map, 0, sizeof(map)); if (ints[0] > 0) map.irq = ints[1]; if (ints[0] > 1) |