From 75c49da0febaa745aa8ec9660b399ab16b125332 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 29 Aug 2008 14:37:23 -0700
Subject: [PATCH] --- yaml --- r: 109430 b: refs/heads/master c:
 7c19a3d280297d43ef5ff7c6b205dc208a16d3d1 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/Kbuild    |  1 -
 trunk/include/linux/mroute.h  |  2 +-
 trunk/include/linux/mroute6.h |  1 +
 trunk/include/linux/pim.h     | 18 ------------------
 5 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index 42f50a35d58b..f090e041651f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 102396ae65108b026e4e1868e30fa013f45a169e
+refs/heads/master: 7c19a3d280297d43ef5ff7c6b205dc208a16d3d1
diff --git a/trunk/include/linux/Kbuild b/trunk/include/linux/Kbuild
index 7d970678f940..59391250d51c 100644
--- a/trunk/include/linux/Kbuild
+++ b/trunk/include/linux/Kbuild
@@ -297,7 +297,6 @@ unifdef-y += parport.h
 unifdef-y += patchkey.h
 unifdef-y += pci.h
 unifdef-y += personality.h
-unifdef-y += pim.h
 unifdef-y += pktcdvd.h
 unifdef-y += pmu.h
 unifdef-y += poll.h
diff --git a/trunk/include/linux/mroute.h b/trunk/include/linux/mroute.h
index 07112ee9293a..8a455694d682 100644
--- a/trunk/include/linux/mroute.h
+++ b/trunk/include/linux/mroute.h
@@ -6,7 +6,6 @@
 #ifdef __KERNEL__
 #include <linux/in.h>
 #endif
-#include <linux/pim.h>
 
 /*
  *	Based on the MROUTING 3.5 defines primarily to keep
@@ -130,6 +129,7 @@ struct igmpmsg
  */
 
 #ifdef __KERNEL__
+#include <linux/pim.h>
 #include <net/sock.h>
 
 #ifdef CONFIG_IP_MROUTE
diff --git a/trunk/include/linux/mroute6.h b/trunk/include/linux/mroute6.h
index 5cf50473a10f..6f4c180179e2 100644
--- a/trunk/include/linux/mroute6.h
+++ b/trunk/include/linux/mroute6.h
@@ -115,6 +115,7 @@ struct sioc_mif_req6
 
 #ifdef __KERNEL__
 
+#include <linux/pim.h>
 #include <linux/skbuff.h>	/* for struct sk_buff_head */
 
 #ifdef CONFIG_IPV6_MROUTE
diff --git a/trunk/include/linux/pim.h b/trunk/include/linux/pim.h
index 236ffd317394..1ba0661561a4 100644
--- a/trunk/include/linux/pim.h
+++ b/trunk/include/linux/pim.h
@@ -3,22 +3,6 @@
 
 #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
@@ -27,7 +11,6 @@ struct pim {
 #define PIM_VERSION		2
 #define PIM_REGISTER		1
 
-#if defined(__KERNEL__)
 #define PIM_NULL_REGISTER	__constant_htonl(0x40000000)
 
 /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
@@ -42,4 +25,3 @@ struct pimreghdr
 struct sk_buff;
 extern int pim_rcv_v1(struct sk_buff *);
 #endif
-#endif