3 files changed, 27 insertions, 2 deletions

diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h
index 0a4a6cb35338..c796ce26c7c0 100644
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
@@ -28,6 +28,8 @@ enum
         IPV4_DEVCONF_ARPFILTER,
         IPV4_DEVCONF_MEDIUM_ID,
         IPV4_DEVCONF_FORCE_IGMP_VERSION,
+        IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL,
+        IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL,
         IPV4_DEVCONF_NOXFRM,
         IPV4_DEVCONF_NOPOLICY,
         IPV4_DEVCONF_ARP_ANNOUNCE,
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 87d47ce9fa33..a1b5bcbd04ae 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -73,6 +73,8 @@ static struct ipv4_devconf ipv4_devconf = {
                 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
                 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
                 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
+                [IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL - 1] = 10000 /*ms*/,
+                [IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL - 1] =  1000 /*ms*/,
         },
 };
 
@@ -83,6 +85,8 @@ static struct ipv4_devconf ipv4_devconf_dflt = {
                 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
                 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
                 [IPV4_DEVCONF_ACCEPT_SOURCE_ROUTE - 1] = 1,
+                [IPV4_DEVCONF_IGMPV2_UNSOLICITED_REPORT_INTERVAL - 1] = 10000 /*ms*/,
+                [IPV4_DEVCONF_IGMPV3_UNSOLICITED_REPORT_INTERVAL - 1] =  1000 /*ms*/,
         },
 };
 
@@ -2096,6 +2100,10 @@ static struct devinet_sysctl_table {
                 DEVINET_SYSCTL_RW_ENTRY(PROXY_ARP_PVLAN, "proxy_arp_pvlan"),
                 DEVINET_SYSCTL_RW_ENTRY(FORCE_IGMP_VERSION,
                                         "force_igmp_version"),
+                DEVINET_SYSCTL_RW_ENTRY(IGMPV2_UNSOLICITED_REPORT_INTERVAL,
+                                        "igmpv2_unsolicited_report_interval"),
+                DEVINET_SYSCTL_RW_ENTRY(IGMPV3_UNSOLICITED_REPORT_INTERVAL,
+                                        "igmpv3_unsolicited_report_interval"),
 
                 DEVINET_SYSCTL_FLUSHING_ENTRY(NOXFRM, "disable_xfrm"),
                 DEVINET_SYSCTL_FLUSHING_ENTRY(NOPOLICY, "disable_policy"),
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index ceb19ab9cf9d..d6c0e64ec97f 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -142,10 +142,25 @@
 
 static int unsolicited_report_interval(struct in_device *in_dev)
 {
+        int interval_ms, interval_jiffies;
+
         if (IGMP_V1_SEEN(in_dev) || IGMP_V2_SEEN(in_dev))
-                return IGMP_V2_Unsolicited_Report_Interval;
+                interval_ms = IN_DEV_CONF_GET(
+                        in_dev,
+                        IGMPV2_UNSOLICITED_REPORT_INTERVAL);
         else /* v3 */
-                return IGMP_V3_Unsolicited_Report_Interval;
+                interval_ms = IN_DEV_CONF_GET(
+                        in_dev,
+                        IGMPV3_UNSOLICITED_REPORT_INTERVAL);
+
+        interval_jiffies = msecs_to_jiffies(interval_ms);
+
+        /* _timer functions can't handle a delay of 0 jiffies so ensure
+         *  we always return a positive value.
+         */
+        if (interval_jiffies <= 0)
+                interval_jiffies = 1;
+        return interval_jiffies;
 }
 
 static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im);