fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / igmp.h

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index c8bccd0..9dbb525 100644 (file)
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -30,8 +30,8 @@ struct igmphdr
 {
        __u8 type;
        __u8 code;              /* For newer IGMP */
-       __u16 csum;
-       __u32 group;
+       __sum16 csum;
+       __be32 group;
 };
 
 /* V3 group record types [grec_type] */
@@ -45,25 +45,25 @@ struct igmphdr
 struct igmpv3_grec {
        __u8    grec_type;
        __u8    grec_auxwords;
-       __u16   grec_nsrcs;
-       __u32   grec_mca;
-       __u32   grec_src[0];
+       __be16  grec_nsrcs;
+       __be32  grec_mca;
+       __be32  grec_src[0];
 };
 
 struct igmpv3_report {
        __u8 type;
        __u8 resv1;
-       __u16 csum;
-       __u16 resv2;
-       __u16 ngrec;
+       __be16 csum;
+       __be16 resv2;
+       __be16 ngrec;
        struct igmpv3_grec grec[0];
 };
 
 struct igmpv3_query {
        __u8 type;
        __u8 code;
-       __u16 csum;
-       __u32 group;
+       __be16 csum;
+       __be32 group;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
        __u8 qrv:3,
             suppress:1,
@@ -76,8 +76,8 @@ struct igmpv3_query {
 #error "Please fix <asm/byteorder.h>"
 #endif
        __u8 qqic;
-       __u16 nsrcs;
-       __u32 srcs[0];
+       __be16 nsrcs;
+       __be32 srcs[0];
 };
 
 #define IGMP_HOST_MEMBERSHIP_QUERY     0x11    /* From RFC1112 */
@@ -127,6 +127,7 @@ struct igmpv3_query {
 
 #ifdef __KERNEL__
 #include <linux/skbuff.h>
+#include <linux/timer.h>
 #include <linux/in.h>
 
 extern int sysctl_igmp_max_memberships;
@@ -136,11 +137,11 @@ struct ip_sf_socklist
 {
        unsigned int            sl_max;
        unsigned int            sl_count;
-       __u32                   sl_addr[0];
+       __be32                  sl_addr[0];
 };
 
 #define IP_SFLSIZE(count)      (sizeof(struct ip_sf_socklist) + \
-       (count) * sizeof(__u32))
+       (count) * sizeof(__be32))
 
 #define IP_SFBLOCK     10      /* allocate this many at once */
 
@@ -159,7 +160,7 @@ struct ip_mc_socklist
 struct ip_sf_list
 {
        struct ip_sf_list       *sf_next;
-       __u32                   sf_inaddr;
+       __be32                  sf_inaddr;
        unsigned long           sf_count[2];    /* include/exclude counts */
        unsigned char           sf_gsresp;      /* include in g & s response? */
        unsigned char           sf_oldin;       /* change state */
@@ -169,7 +170,7 @@ struct ip_sf_list
 struct ip_mc_list
 {
        struct in_device        *interface;
-       unsigned long           multiaddr;
+       __be32                  multiaddr;
        struct ip_sf_list       *sources;
        struct ip_sf_list       *tomb;
        unsigned int            sfmode;
@@ -197,7 +198,7 @@ struct ip_mc_list
 #define IGMPV3_QQIC(value) IGMPV3_EXP(0x80, 4, 3, value)
 #define IGMPV3_MRC(value) IGMPV3_EXP(0x80, 4, 3, value)
 
-extern int ip_check_mc(struct in_device *dev, u32 mc_addr, u32 src_addr, u16 proto);
+extern int ip_check_mc(struct in_device *dev, __be32 mc_addr, __be32 src_addr, u16 proto);
 extern int igmp_rcv(struct sk_buff *);
 extern int ip_mc_join_group(struct sock *sk, struct ip_mreqn *imr);
 extern int ip_mc_leave_group(struct sock *sk, struct ip_mreqn *imr);
@@ -209,13 +210,13 @@ extern int ip_mc_msfget(struct sock *sk, struct ip_msfilter *msf,
                struct ip_msfilter __user *optval, int __user *optlen);
 extern int ip_mc_gsfget(struct sock *sk, struct group_filter *gsf,
                struct group_filter __user *optval, int __user *optlen);
-extern int ip_mc_sf_allow(struct sock *sk, u32 local, u32 rmt, int dif);
+extern int ip_mc_sf_allow(struct sock *sk, __be32 local, __be32 rmt, int dif);
 extern void ip_mr_init(void);
 extern void ip_mc_init_dev(struct in_device *);
 extern void ip_mc_destroy_dev(struct in_device *);
 extern void ip_mc_up(struct in_device *);
 extern void ip_mc_down(struct in_device *);
-extern void ip_mc_dec_group(struct in_device *in_dev, u32 addr);
-extern void ip_mc_inc_group(struct in_device *in_dev, u32 addr);
+extern void ip_mc_dec_group(struct in_device *in_dev, __be32 addr);
+extern void ip_mc_inc_group(struct in_device *in_dev, __be32 addr);
 #endif
 #endif