X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Figmp.h;fp=include%2Flinux%2Figmp.h;h=c8bccd003b61f49d6dfdafae1ea91a6bd23c8dc7;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=899c3d4776f3dffc690274bd3dfb44224c6608ab;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 899c3d477..c8bccd003 100644
--- 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)