diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-02 20:22:52 -0400 |
---|---|---|
committer | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2008-04-03 21:44:42 -0400 |
commit | 80a9492a33dd7d852465625022d56ff76d62174d (patch) | |
tree | 7f8976d803a1d7fddae9b53164a8d5774aa15bb5 /include/linux/pim.h | |
parent | 2e8046271f68198dd37451017c1a4a2432e4ec68 (diff) |
[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>
Diffstat (limited to 'include/linux/pim.h')
-rw-r--r-- | include/linux/pim.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/pim.h b/include/linux/pim.h index 6f689dc85503..236ffd317394 100644 --- a/include/linux/pim.h +++ b/include/linux/pim.h | |||
@@ -3,6 +3,22 @@ | |||
3 | 3 | ||
4 | #include <asm/byteorder.h> | 4 | #include <asm/byteorder.h> |
5 | 5 | ||
6 | #ifndef __KERNEL__ | ||
7 | struct pim { | ||
8 | #if defined(__LITTLE_ENDIAN_BITFIELD) | ||
9 | __u8 pim_type:4, /* PIM message type */ | ||
10 | pim_ver:4; /* PIM version */ | ||
11 | #elif defined(__BIG_ENDIAN_BITFIELD) | ||
12 | __u8 pim_ver:4; /* PIM version */ | ||
13 | pim_type:4; /* PIM message type */ | ||
14 | #endif | ||
15 | __u8 pim_rsv; /* Reserved */ | ||
16 | __be16 pim_cksum; /* Checksum */ | ||
17 | }; | ||
18 | |||
19 | #define PIM_MINLEN 8 | ||
20 | #endif | ||
21 | |||
6 | /* Message types - V1 */ | 22 | /* Message types - V1 */ |
7 | #define PIM_V1_VERSION __constant_htonl(0x10000000) | 23 | #define PIM_V1_VERSION __constant_htonl(0x10000000) |
8 | #define PIM_V1_REGISTER 1 | 24 | #define PIM_V1_REGISTER 1 |