summaryrefslogtreecommitdiff
path: root/pfinet/linux-src/include/linux/ip.h
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2000-02-05 12:21:17 +0000
committerRoland McGrath <roland@gnu.org>2000-02-05 12:21:17 +0000
commit11282e4f068cacd7d08e61c5372b560f4656df87 (patch)
tree7330691c769e4cddf13fb86e58b80b61cd71ce2a /pfinet/linux-src/include/linux/ip.h
parenta60df9686250648ac13f559e98ebdc1422146494 (diff)
parente5f75e8ece5d1a8d3c17bd0156082caf153d3779 (diff)
Merge from vendor branch Linux:
Import of Linux 2.2.14 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/include/linux/ip.h')
-rw-r--r--pfinet/linux-src/include/linux/ip.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/pfinet/linux-src/include/linux/ip.h b/pfinet/linux-src/include/linux/ip.h
index 6675cee9..7b642728 100644
--- a/pfinet/linux-src/include/linux/ip.h
+++ b/pfinet/linux-src/include/linux/ip.h
@@ -88,6 +88,8 @@
#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */
#define IPOPT_TS_PRESPEC 3 /* specified modules only */
+#ifdef __KERNEL__
+
struct ip_options {
__u32 faddr; /* Saved first hop address */
unsigned char optlen;
@@ -108,7 +110,6 @@ struct ip_options {
unsigned char __data[0];
};
-#ifdef __KERNEL__
#define optlength(opt) (sizeof(struct ip_options) + opt->optlen)
#endif