diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-29 14:37:23 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 14:37:23 -0700 |
commit | 7c19a3d280297d43ef5ff7c6b205dc208a16d3d1 (patch) | |
tree | cb8b2603086f117eb543f91a41a42fefede4f31a /include/linux/mroute.h | |
parent | 102396ae65108b026e4e1868e30fa013f45a169e (diff) | |
download | linux-stable-7c19a3d280297d43ef5ff7c6b205dc208a16d3d1.tar.gz linux-stable-7c19a3d280297d43ef5ff7c6b205dc208a16d3d1.tar.bz2 linux-stable-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/mroute.h')
-rw-r--r-- | include/linux/mroute.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mroute.h b/include/linux/mroute.h index 07112ee9293a..8a455694d682 100644 --- a/include/linux/mroute.h +++ b/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 |