X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=net%2Fcore%2Frtnetlink.c;h=d69c4644f8f2ca5a4e1bda711672af2dafcf604c;hb=e800072c18f0d7b89a80fa46dceb3d080c80e09c;hp=d471f097c739f09eb2034c79e800f1d64a936c0b;hpb=e8ed77dfa90dd79c5343415a4bbbfdab9787b35a;p=sfrench%2Fcifs-2.6.git 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;