diff options
| author | Andy Grover <agrover@groveronline.com> | 2003-03-20 18:45:08 -0800 |
|---|---|---|
| committer | Andy Grover <agrover@groveronline.com> | 2003-03-20 18:45:08 -0800 |
| commit | ff6e14381a7c1597c4ffbeb760e9802f3ebaebb2 (patch) | |
| tree | f5463b22c7b9b67342cde9e46f1d3a3068019ec8 /include/linux/ip.h | |
| parent | ecabd7d2dd8117b1ec4cc4b7303a7e8198843684 (diff) | |
| parent | aa43a933c82fe96479cd5e260a221b69409a553b (diff) | |
Merge groveronline.com:/root/bk/linux-2.5
into groveronline.com:/root/bk/linux-acpi
Diffstat (limited to 'include/linux/ip.h')
| -rw-r--r-- | include/linux/ip.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/ip.h b/include/linux/ip.h index f655ce138e78..1c26df3103a8 100644 --- a/include/linux/ip.h +++ b/include/linux/ip.h @@ -18,8 +18,6 @@ #define _LINUX_IP_H #include <asm/byteorder.h> -/* SOL_IP socket options */ - #define IPTOS_TOS_MASK 0x1E #define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK) #define IPTOS_LOWDELAY 0x10 @@ -67,14 +65,6 @@ #define MAXTTL 255 #define IPDEFTTL 64 -/* struct timestamp, struct route and MAX_ROUTES are removed. - - 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 #define IPOPT_OFFSET 2 |