From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Thu, 3 Apr 2008 00:22:52 +0000 (+0900)
Subject: [IPV4] MROUTE: Adjust include files for user-space.
X-Git-Tag: v2.6.26-rc1~1138^2~210
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80a9492a33dd7d852465625022d56ff76d62174d;p=linux-2.6

[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>
---

diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index c41b4217ae..de4decfa1b 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 6f689dc855..236ffd3173 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