1 files changed, 11 insertions, 6 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 34ca6d5a3a4b..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*/,
         },
 };
 
@@ -1126,10 +1130,7 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len)
                 if (len < (int) sizeof(ifr))
                         break;
                 memset(&ifr, 0, sizeof(struct ifreq));
-                if (ifa->ifa_label)
-                        strcpy(ifr.ifr_name, ifa->ifa_label);
-                else
-                        strcpy(ifr.ifr_name, dev->name);
+                strcpy(ifr.ifr_name, ifa->ifa_label);
 
                 (*(struct sockaddr_in *)&ifr.ifr_addr).sin_family = AF_INET;
                 (*(struct sockaddr_in *)&ifr.ifr_addr).sin_addr.s_addr =
@@ -2097,11 +2098,15 @@ static struct devinet_sysctl_table {
                 DEVINET_SYSCTL_RW_ENTRY(ARP_ACCEPT, "arp_accept"),
                 DEVINET_SYSCTL_RW_ENTRY(ARP_NOTIFY, "arp_notify"),
                 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"),
-                DEVINET_SYSCTL_FLUSHING_ENTRY(FORCE_IGMP_VERSION,
-                                              "force_igmp_version"),
                 DEVINET_SYSCTL_FLUSHING_ENTRY(PROMOTE_SECONDARIES,
                                               "promote_secondaries"),
                 DEVINET_SYSCTL_FLUSHING_ENTRY(ROUTE_LOCALNET,