diff options
author | Jeff Dike <jdike@addtoit.com> | 2005-06-13 15:52:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 20:58:43 -0700 |
commit | a3c77c67a443e631febf708bb0c376caede31657 (patch) | |
tree | 75672c8dec41054de7b635df59a9f014f6a5ad14 /arch/um/drivers/slip.h | |
parent | 98fdffccea6cc3fe9dba32c0fcc310bcb5d71529 (diff) | |
download | kernel_samsung_tuna-a3c77c67a443e631febf708bb0c376caede31657.zip kernel_samsung_tuna-a3c77c67a443e631febf708bb0c376caede31657.tar.gz kernel_samsung_tuna-a3c77c67a443e631febf708bb0c376caede31657.tar.bz2 |
[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/slip.h')
-rw-r--r-- | arch/um/drivers/slip.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/arch/um/drivers/slip.h b/arch/um/drivers/slip.h index d523618..bb0dab4 100644 --- a/arch/um/drivers/slip.h +++ b/arch/um/drivers/slip.h @@ -1,10 +1,7 @@ #ifndef __UM_SLIP_H #define __UM_SLIP_H -#define BUF_SIZE 1500 - /* two bytes each for a (pathological) max packet of escaped chars + * - * terminating END char + initial END char */ -#define ENC_BUF_SIZE (2 * BUF_SIZE + 2) +#include "slip_common.h" struct slip_data { void *dev; @@ -12,28 +9,12 @@ struct slip_data { char *addr; char *gate_addr; int slave; - unsigned char ibuf[ENC_BUF_SIZE]; - unsigned char obuf[ENC_BUF_SIZE]; - int more; /* more data: do not read fd until ibuf has been drained */ - int pos; - int esc; + struct slip_proto slip; }; extern struct net_user_info slip_user_info; -extern int set_umn_addr(int fd, char *addr, char *ptp_addr); extern int slip_user_read(int fd, void *buf, int len, struct slip_data *pri); extern int slip_user_write(int fd, void *buf, int len, struct slip_data *pri); #endif - -/* - * Overrides for Emacs so that we follow Linus's tabbing style. - * Emacs will notice this stuff at the end of the file and automatically - * adjust the settings for this buffer only. This must remain at the end - * of the file. - * --------------------------------------------------------------------------- - * Local variables: - * c-file-style: "linux" - * End: - */ |