aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-04-03 09:22:52 +0900
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2008-04-04 10:44:42 +0900
commit80a9492a33dd7d852465625022d56ff76d62174d (patch)
tree7f8976d803a1d7fddae9b53164a8d5774aa15bb5
parent2e8046271f68198dd37451017c1a4a2432e4ec68 (diff)
[IPV4] MROUTE: Adjust include files for user-space.
<linux/mroute.h> needs <linux/types.h>. Avoid including <linux/in.h> in user-space, which conflicts with standard <netinet/in.h>. Add basic struct and constant in <linux/pim.h>. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
-rw-r--r--include/linux/mroute.h3
-rw-r--r--include/linux/pim.h16
2 files changed, 19 insertions, 0 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index c41b4217ae3..de4decfa1bf 100644
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -2,7 +2,10 @@
#define __LINUX_MROUTE_H
#include <linux/sockios.h>
+#include <linux/types.h>
+#ifdef __KERNEL__
#include <linux/in.h>
+#endif
#include <linux/pim.h>
/*
diff --git a/include/linux/pim.h b/include/linux/pim.h
index 6f689dc8550..236ffd31739 100644
--- a/include/linux/pim.h
+++ b/include/linux/pim.h
@@ -3,6 +3,22 @@
#include <asm/byteorder.h>
+#ifndef __KERNEL__
+struct pim {
+#if defined(__LITTLE_ENDIAN_BITFIELD)
+ __u8 pim_type:4, /* PIM message type */
+ pim_ver:4; /* PIM version */
+#elif defined(__BIG_ENDIAN_BITFIELD)
+ __u8 pim_ver:4; /* PIM version */
+ pim_type:4; /* PIM message type */
+#endif
+ __u8 pim_rsv; /* Reserved */
+ __be16 pim_cksum; /* Checksum */
+};
+
+#define PIM_MINLEN 8
+#endif
+
/* Message types - V1 */
#define PIM_V1_VERSION __constant_htonl(0x10000000)
#define PIM_V1_REGISTER 1