diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /include/linux/ip.h | |
parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'include/linux/ip.h')
-rw-r--r-- | include/linux/ip.h | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/include/linux/ip.h b/include/linux/ip.h index f09175b4e..6675cee95 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h @@ -67,29 +67,13 @@ #define MAXTTL 255 #define IPDEFTTL 64 -struct timestamp { - __u8 len; - __u8 ptr; -#if defined(__LITTLE_ENDIAN_BITFIELD) - __u8 flags:4, - overflow:4; -#elif defined(__BIG_ENDIAN_BITFIELD) - __u8 overflow:4, - flags:4; -#else -#error "Please fix <asm/byteorder.h>" -#endif - __u32 data[9]; -}; +/* struct timestamp, struct route and MAX_ROUTES are removed. - -#define MAX_ROUTE 16 - -struct route { - char route_size; - char pointer; - unsigned long route[MAX_ROUTE]; -}; + REASONS: it is clear that nobody used them because: + - MAX_ROUTES value was wrong. + - "struct route" was wrong. + - "struct timestamp" had fatally misaligned bitfields and was completely unusable. + */ #define IPOPT_OPTVAL 0 #define IPOPT_OLEN 1 @@ -102,7 +86,7 @@ struct route { #define IPOPT_TS_TSONLY 0 /* timestamps only */ #define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ -#define IPOPT_TS_PRESPEC 2 /* specified modules only */ +#define IPOPT_TS_PRESPEC 3 /* specified modules only */ struct ip_options { __u32 faddr; /* Saved first hop address */ |