Pull bugzilla-7570 into release branch

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

diff --git a/include/linux/igmp.h b/include/linux/igmp.h
index 6e7ea2f0a57c557b80c7b77de0f8bad13dafba36..a113fe68d8a1c24c9dfb680e1a1ad0b9fc477ba1 100644 (file)
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
@@ -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;
@@ -217,5 +218,7 @@ 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, __be32 addr);
 extern void ip_mc_inc_group(struct in_device *in_dev, __be32 addr);
+extern void ip_mc_rejoin_group(struct ip_mc_list *im);
+
 #endif
 #endif