From: Andrew Morton <[email protected]>
Subject: net/ipv6/route.c: work around gcc-4.4.4 anon union initializer issue
gcc-4.4.4 has problems with initializers of anonymous union fields.
net/ipv6/route.c: In function 'rt6_sync_up':
net/ipv6/route.c:3586: error: unknown field 'nh_flags' specified in initializer
net/ipv6/route.c:3586: warning: missing braces around initializer
net/ipv6/route.c:3586: warning: (near initialization for 'arg.<anonymous>')
net/ipv6/route.c: In function 'rt6_sync_down_dev':
net/ipv6/route.c:3695: error: unknown field 'event' specified in initializer
net/ipv6/route.c:3695: warning: missing braces around initializer
net/ipv6/route.c:3695: warning: (near initialization for 'arg.<anonymous>')
Fixes: 2127d95aef6c ("ipv6: Clear nexthop flags upon netdev up")
Cc: Ido Schimmel <[email protected]>
Cc: David Ahern <[email protected]>
Cc: David S. Miller <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
net/ipv6/route.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN
net/ipv6/route.c~net-ipv6-routec-work-around-gcc-444-anon-union-initializer-issue
net/ipv6/route.c
---
a/net/ipv6/route.c~net-ipv6-routec-work-around-gcc-444-anon-union-initializer-issue
+++ a/net/ipv6/route.c
@@ -3583,7 +3583,7 @@ void rt6_sync_up(struct net_device *dev,
{
struct arg_netdev_event arg = {
.dev = dev,
- .nh_flags = nh_flags,
+ { .nh_flags = nh_flags, },
};
if (nh_flags & RTNH_F_DEAD && netif_carrier_ok(dev))
@@ -3692,7 +3692,7 @@ void rt6_sync_down_dev(struct net_device
{
struct arg_netdev_event arg = {
.dev = dev,
- .event = event,
+ { .event = event, },
};
fib6_clean_all(dev_net(dev), fib6_ifdown, &arg);
_
