Merge tag 'v3.10.102' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / core / rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 7e051eef26134b532cec6dbcbadc9de0fa1098d5..62e64219aeb57f0d4c4e05db6248ca9b24ecc890 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -910,14 +910,16 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
                goto nla_put_failure;
 
        if (1) {
-               struct rtnl_link_ifmap map = {
-                       .mem_start   = dev->mem_start,
-                       .mem_end     = dev->mem_end,
-                       .base_addr   = dev->base_addr,
-                       .irq         = dev->irq,
-                       .dma         = dev->dma,
-                       .port        = dev->if_port,
-               };
+               struct rtnl_link_ifmap map;
+
+               memset(&map, 0, sizeof(map));
+               map.mem_start   = dev->mem_start;
+               map.mem_end     = dev->mem_end;
+               map.base_addr   = dev->base_addr;
+               map.irq         = dev->irq;
+               map.dma         = dev->dma;
+               map.port        = dev->if_port;
+
                if (nla_put(skb, IFLA_MAP, sizeof(map), &map))
                        goto nla_put_failure;
        }