Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 8 deletions

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index d471f097c739..d69c4644f8f2 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1173,14 +1173,16 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
 
 static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)
 {
-        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_64bit(skb, IFLA_MAP, sizeof(map), &map, IFLA_PAD))
                 return -EMSGSIZE;