diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 17:51:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:13:00 -0400 |
commit | f34d9d2dcb7f17b64124841345b23adc0843e7a5 (patch) | |
tree | 0bb200273bcc37da8dd32945ae25c213c9efe2c2 /arch/um/include | |
parent | b16895b63c504698b0c3ab26ca3c41a4fa162a42 (diff) |
uml: network interface hotplug error handling
This fixes a number of problems associated with network interface hotplug.
The userspace initialization function can fail in some cases, but the
failure was never passed back to eth_configure, which proceeded with the
configuration. This results in a zombie device that is present, but can't
work. This is fixed by allowing the initialization routines to return an
error, which is checked, and the configuration aborted on failure.
eth_configure failed to check for many failures. Even when it did check,
it didn't undo whatever initializations has already happened, so a present,
but partially initialized and non-working device could result. It now
checks everything that can fail, and bails out, undoing whatever had been
done.
The return value of eth_configure was always ignored, so it is now just
void.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/include')
-rw-r--r-- | arch/um/include/net_user.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/net_user.h b/arch/um/include/net_user.h index 19f207cd70fe..cfe7c50634b9 100644 --- a/arch/um/include/net_user.h +++ b/arch/um/include/net_user.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #define UML_NET_VERSION (4) | 14 | #define UML_NET_VERSION (4) |
15 | 15 | ||
16 | struct net_user_info { | 16 | struct net_user_info { |
17 | void (*init)(void *, void *); | 17 | int (*init)(void *, void *); |
18 | int (*open)(void *); | 18 | int (*open)(void *); |
19 | void (*close)(int, void *); | 19 | void (*close)(int, void *); |
20 | void (*remove)(void *); | 20 | void (*remove)(void *); |