aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/slirp_kern.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-06-18 08:36:46 +0100
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-06-18 08:36:46 +0100
commit0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d (patch)
tree9b9337ae627fc56a0eda43c60860765f25efaa0b /arch/um/drivers/slirp_kern.c
parent1c3f45ab2f7f879ea482501c83899505c31f7539 (diff)
parent9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff)
downloadkernel_samsung_smdk4412-0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d.zip
kernel_samsung_smdk4412-0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d.tar.gz
kernel_samsung_smdk4412-0107b3cf3225aed6ddde4fa8dbcd4ed643b34f4d.tar.bz2
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/drivers/slirp_kern.c')
-rw-r--r--arch/um/drivers/slirp_kern.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/um/drivers/slirp_kern.c b/arch/um/drivers/slirp_kern.c
index c9d6b52..9864d27 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;