[GFS2] Fix up merge of Linus' kernel into GFS2

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

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 0c31ef0b5badc3d9dffb39a7414459d2101ae5dd..899c3d4776f3dffc690274bd3dfb44224c6608ab 100644 (file)
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -129,6 +129,9 @@ struct igmpv3_query {
 #include <linux/skbuff.h>
 #include <linux/in.h>
 
+extern int sysctl_igmp_max_memberships;
+extern int sysctl_igmp_max_msf;
+
 struct ip_sf_socklist
 {
        unsigned int            sl_max;
@@ -166,7 +169,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;