net: vrf: avoid gcc-4.6 warning

When building an allmodconfig kernel with gcc-4.6, we get a rather
odd warning:

drivers/net/vrf.c: In function ‘vrf_ip6_input_dst’:
drivers/net/vrf.c:964:3: error: initialized field with side-effects overwritten [-Werror]
drivers/net/vrf.c:964:3: error: (near initialization for ‘fl6’) [-Werror]

I have no idea what this warning is even trying to say, but it does
seem like a false positive. Reordering the initialization in to match
the structure definition gets rid of the warning, and might also avoid
whatever gcc thinks is wrong here.

Fixes: 9ff74384600a ("net: vrf: Handle ipv6 multicast and link-local addresses")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index 7e19051f32303195dc7d4ed9707f237e387a6e29..9b243e6f3008bb5319844412cd49db1cd7bce594 100644 (file)
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -957,12 +957,12 @@ static void vrf_ip6_input_dst(struct sk_buff *skb, struct net_device *vrf_dev,
 {
        const struct ipv6hdr *iph = ipv6_hdr(skb);
        struct flowi6 fl6 = {
+               .flowi6_iif     = ifindex,
+               .flowi6_mark    = skb->mark,
+               .flowi6_proto   = iph->nexthdr,
                .daddr          = iph->daddr,
                .saddr          = iph->saddr,
                .flowlabel      = ip6_flowinfo(iph),
-               .flowi6_mark    = skb->mark,
-               .flowi6_proto   = iph->nexthdr,
-               .flowi6_iif     = ifindex,
        };
        struct net *net = dev_net(vrf_dev);
        struct rt6_info *rt6;