summaryrefslogtreecommitdiffstats
path: root/include/linux/mroute6.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-29 14:37:23 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-29 14:37:23 -0700
commit7c19a3d280297d43ef5ff7c6b205dc208a16d3d1 (patch)
treecb8b2603086f117eb543f91a41a42fefede4f31a /include/linux/mroute6.h
parent102396ae65108b026e4e1868e30fa013f45a169e (diff)
downloadlinux-7c19a3d280297d43ef5ff7c6b205dc208a16d3d1.tar.gz
linux-7c19a3d280297d43ef5ff7c6b205dc208a16d3d1.tar.bz2
linux-7c19a3d280297d43ef5ff7c6b205dc208a16d3d1.zip
net: Unbreak userspace usage of linux/mroute.h
Nothing in linux/pim.h should be exported to userspace. This should fix the XORP build failure reported by Jose Calhariz, the debain package maintainer. Nothing originally in linux/mroute.h was exported to userspace ever, but some of this stuff started to be when it was moved into this new linux/pim.h, and that was wrong. If we didn't provide these definitions for 10 years we can reasonably expect that applications defined this stuff locally or used GLIBC headers providing the protocol definitions. And as such the only result of this can be conflict and userland build breakage. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mroute6.h')
-rw-r--r--include/linux/mroute6.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h
index 5cf50473a10f..6f4c180179e2 100644
--- a/include/linux/mroute6.h
+++ b/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