linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 899c3d4..c8bccd0 100644 (file)
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -169,7 +169,7 @@ struct ip_sf_list
 struct ip_mc_list
 {
        struct in_device        *interface;
-       __be32                  multiaddr;
+       unsigned long           multiaddr;
        struct ip_sf_list       *sources;
        struct ip_sf_list       *tomb;
        unsigned int            sfmode;
@@ -191,7 +191,7 @@ struct ip_mc_list
 #define IGMPV3_MASK(value, nb) ((nb)>=32 ? (value) : ((1<<(nb))-1) & (value))
 #define IGMPV3_EXP(thresh, nbmant, nbexp, value) \
        ((value) < (thresh) ? (value) : \
-        ((IGMPV3_MASK(value, nbmant) | (1<<(nbmant+nbexp))) << \
+        ((IGMPV3_MASK(value, nbmant) | (1<<(nbmant))) << \
          (IGMPV3_MASK((value) >> (nbmant), nbexp) + (nbexp))))
 
 #define IGMPV3_QQIC(value) IGMPV3_EXP(0x80, 4, 3, value)