diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 19:10:49 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 19:10:49 +0200 |
| commit | 80bd6d7f5e0d872a0f5a151473d2a39d95d210a8 (patch) | |
| tree | b3a36048d6b7de88f7e906624ecb4b98816bb736 /arch/um/drivers/slip_kern.c | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds... (diff) | |
| parent | Merge rsync://oss.sgi.com/git/xfs-2.6 (diff) | |
| download | linux-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.tar.xz linux-80bd6d7f5e0d872a0f5a151473d2a39d95d210a8.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/um/drivers/slip_kern.c')
| -rw-r--r-- | arch/um/drivers/slip_kern.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c index 0886eedba213..9a6f5c85f902 100644 --- a/arch/um/drivers/slip_kern.c +++ b/arch/um/drivers/slip_kern.c @@ -26,16 +26,16 @@ void slip_init(struct net_device *dev, void *data) .addr = NULL, .gate_addr = init->gate_addr, .slave = -1, - .ibuf = { '\0' }, - .obuf = { '\0' }, - .pos = 0, - .esc = 0, + .slip = SLIP_PROTO_INIT, .dev = dev }); dev->init = NULL; + dev->header_cache_update = NULL; + dev->hard_header_cache = NULL; + dev->hard_header = NULL; dev->hard_header_len = 0; - dev->addr_len = 4; - dev->type = ARPHRD_ETHER; + dev->addr_len = 0; + dev->type = ARPHRD_SLIP; dev->tx_queue_len = 256; dev->flags = IFF_NOARP; printk("SLIP backend - SLIP IP = %s\n", spri->gate_addr); |