diff options
| author | Jeff Dike | 2005-06-14 00:52:18 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-06-14 05:58:43 +0200 |
| commit | a3c77c67a443e631febf708bb0c376caede31657 (patch) | |
| tree | 75672c8dec41054de7b635df59a9f014f6a5ad14 /arch/um/drivers/slirp_kern.c | |
| parent | [PATCH] uml: use fork instead of clone (diff) | |
| download | kernel-qcow2-linux-a3c77c67a443e631febf708bb0c376caede31657.tar.gz kernel-qcow2-linux-a3c77c67a443e631febf708bb0c376caede31657.tar.xz kernel-qcow2-linux-a3c77c67a443e631febf708bb0c376caede31657.zip | |
[PATCH] uml: slirp and slip driver cleanups and fixes
This patch merges a lot of duplicated code in the slip and slirp drivers,
abstracts out the slip protocol, and makes the slip driver work in 2.6.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/drivers/slirp_kern.c')
| -rw-r--r-- | arch/um/drivers/slirp_kern.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c index c9d6b52a831d..9864d27afdbe 100644 --- a/arch/um/drivers/slirp_kern.c +++ b/arch/um/drivers/slirp_kern.c @@ -25,10 +25,7 @@ void slirp_init(struct net_device *dev, void *data) { .argw = init->argw, .pid = -1, .slave = -1, - .ibuf = { '\0' }, - .obuf = { '\0' }, - .pos = 0, - .esc = 0, + .slip = SLIP_PROTO_INIT, .dev = dev }); dev->init = NULL; |