Annotation of /trunk/kernel26-alx/patches-2.6.26-r1/0104-2.6.26.5-all-fixes.patch
Parent Directory | Revision Log
Revision 681 -
(hide annotations)
(download)
Wed Sep 17 19:42:13 2008 UTC (16 years ago) by niro
File size: 2164 byte(s)
Wed Sep 17 19:42:13 2008 UTC (16 years ago) by niro
File size: 2164 byte(s)
-2.6.26-alx-r1
1 | niro | 681 | diff --git a/include/linux/mroute.h b/include/linux/mroute.h |
2 | index 35a8277..5e30ac3 100644 | ||
3 | --- a/include/linux/mroute.h | ||
4 | +++ b/include/linux/mroute.h | ||
5 | @@ -2,7 +2,10 @@ | ||
6 | #define __LINUX_MROUTE_H | ||
7 | |||
8 | #include <linux/sockios.h> | ||
9 | +#include <linux/types.h> | ||
10 | +#ifdef __KERNEL__ | ||
11 | #include <linux/in.h> | ||
12 | +#endif | ||
13 | |||
14 | /* | ||
15 | * Based on the MROUTING 3.5 defines primarily to keep | ||
16 | @@ -126,6 +129,7 @@ struct igmpmsg | ||
17 | */ | ||
18 | |||
19 | #ifdef __KERNEL__ | ||
20 | +#include <linux/pim.h> | ||
21 | #include <net/sock.h> | ||
22 | |||
23 | #ifdef CONFIG_IP_MROUTE | ||
24 | @@ -210,27 +214,6 @@ struct mfc_cache | ||
25 | #define IGMPMSG_WHOLEPKT 3 /* For PIM Register processing */ | ||
26 | |||
27 | #ifdef __KERNEL__ | ||
28 | - | ||
29 | -#define PIM_V1_VERSION __constant_htonl(0x10000000) | ||
30 | -#define PIM_V1_REGISTER 1 | ||
31 | - | ||
32 | -#define PIM_VERSION 2 | ||
33 | -#define PIM_REGISTER 1 | ||
34 | - | ||
35 | -#define PIM_NULL_REGISTER __constant_htonl(0x40000000) | ||
36 | - | ||
37 | -/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ | ||
38 | - | ||
39 | -struct pimreghdr | ||
40 | -{ | ||
41 | - __u8 type; | ||
42 | - __u8 reserved; | ||
43 | - __be16 csum; | ||
44 | - __be32 flags; | ||
45 | -}; | ||
46 | - | ||
47 | -extern int pim_rcv_v1(struct sk_buff *); | ||
48 | - | ||
49 | struct rtmsg; | ||
50 | extern int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait); | ||
51 | #endif | ||
52 | diff --git a/include/linux/mroute6.h b/include/linux/mroute6.h | ||
53 | index e798959..90010dd 100644 | ||
54 | --- a/include/linux/mroute6.h | ||
55 | +++ b/include/linux/mroute6.h | ||
56 | @@ -115,6 +115,7 @@ struct sioc_mif_req6 | ||
57 | |||
58 | #ifdef __KERNEL__ | ||
59 | |||
60 | +#include <linux/pim.h> | ||
61 | #include <linux/skbuff.h> /* for struct sk_buff_head */ | ||
62 | |||
63 | #ifdef CONFIG_IPV6_MROUTE | ||
64 | diff --git a/include/linux/pim.h b/include/linux/pim.h | ||
65 | new file mode 100644 | ||
66 | index 0000000..1ba0661 | ||
67 | --- /dev/null | ||
68 | +++ b/include/linux/pim.h | ||
69 | @@ -0,0 +1,27 @@ | ||
70 | +#ifndef __LINUX_PIM_H | ||
71 | +#define __LINUX_PIM_H | ||
72 | + | ||
73 | +#include <asm/byteorder.h> | ||
74 | + | ||
75 | +/* Message types - V1 */ | ||
76 | +#define PIM_V1_VERSION __constant_htonl(0x10000000) | ||
77 | +#define PIM_V1_REGISTER 1 | ||
78 | + | ||
79 | +/* Message types - V2 */ | ||
80 | +#define PIM_VERSION 2 | ||
81 | +#define PIM_REGISTER 1 | ||
82 | + | ||
83 | +#define PIM_NULL_REGISTER __constant_htonl(0x40000000) | ||
84 | + | ||
85 | +/* PIMv2 register message header layout (ietf-draft-idmr-pimvsm-v2-00.ps */ | ||
86 | +struct pimreghdr | ||
87 | +{ | ||
88 | + __u8 type; | ||
89 | + __u8 reserved; | ||
90 | + __be16 csum; | ||
91 | + __be32 flags; | ||
92 | +}; | ||
93 | + | ||
94 | +struct sk_buff; | ||
95 | +extern int pim_rcv_v1(struct sk_buff *); | ||
96 | +#endif |