iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: Unbreak userspace usage of linux/mroute.h

Browse Source 
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>
This commit is contained in:
David S. Miller 2008-08-29 14:37:23 -07:00
parent 102396ae65
commit 7c19a3d280
4 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/Kbuild
View File

@ -297,7 +297,6 @@ unifdef-y += parport.h
unifdef-y += patchkey.h unifdef-y += patchkey.h
unifdef-y += pci.h unifdef-y += pci.h
unifdef-y += personality.h unifdef-y += personality.h
unifdef-y += pim.h
unifdef-y += pktcdvd.h unifdef-y += pktcdvd.h
unifdef-y += pmu.h unifdef-y += pmu.h
unifdef-y += poll.h unifdef-y += poll.h

2
include/linux/mroute.h
View File

@ -6,7 +6,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/in.h> #include <linux/in.h>
#endif #endif
#include <linux/pim.h>
/* /*
* Based on the MROUTING 3.5 defines primarily to keep * Based on the MROUTING 3.5 defines primarily to keep
@ -130,6 +129,7 @@ struct igmpmsg
*/ */
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/pim.h>
#include <net/sock.h> #include <net/sock.h>
#ifdef CONFIG_IP_MROUTE #ifdef CONFIG_IP_MROUTE

1
include/linux/mroute6.h
View File

@ -115,6 +115,7 @@ struct sioc_mif_req6
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/pim.h>
#include <linux/skbuff.h> /* for struct sk_buff_head */ #include <linux/skbuff.h> /* for struct sk_buff_head */
#ifdef CONFIG_IPV6_MROUTE #ifdef CONFIG_IPV6_MROUTE

18
include/linux/pim.h
View File

@ -3,22 +3,6 @@
#include <asm/byteorder.h> #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 */ /* Message types - V1 */
#define PIM_V1_VERSION __constant_htonl(0x10000000) #define PIM_V1_VERSION __constant_htonl(0x10000000)
#define PIM_V1_REGISTER 1 #define PIM_V1_REGISTER 1
@ -27,7 +11,6 @@ struct pim {
#define PIM_VERSION 2 #define PIM_VERSION 2
#define PIM_REGISTER 1 #define PIM_REGISTER 1
#if defined(__KERNEL__)
#define PIM_NULL_REGISTER __constant_htonl(0x40000000) #define PIM_NULL_REGISTER __constant_htonl(0x40000000)
/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ /* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */
@ -42,4 +25,3 @@ struct pimreghdr
struct sk_buff; struct sk_buff;
extern int pim_rcv_v1(struct sk_buff *); extern int pim_rcv_v1(struct sk_buff *);
#endif #endif
#endif