Commit 6802f3ad authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller

ipv6: Fix build with gcc-4.4.5

Emil reported the following compiler errors:

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>`)

Problem is with the named initializers for the anonymous union members.
Fix this by adding curly braces around the initialization.

Fixes: 4c981e28 ("ipv6: Prepare to handle multiple netdev events")
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reported-by: default avatarEmil S Tantilov <emils.tantilov@gmail.com>
Tested-by: default avatarEmil S Tantilov <emils.tantilov@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e9a03445
...@@ -3583,7 +3583,9 @@ void rt6_sync_up(struct net_device *dev, unsigned int nh_flags) ...@@ -3583,7 +3583,9 @@ void rt6_sync_up(struct net_device *dev, unsigned int nh_flags)
{ {
struct arg_netdev_event arg = { struct arg_netdev_event arg = {
.dev = dev, .dev = dev,
{
.nh_flags = nh_flags, .nh_flags = nh_flags,
},
}; };
if (nh_flags & RTNH_F_DEAD && netif_carrier_ok(dev)) if (nh_flags & RTNH_F_DEAD && netif_carrier_ok(dev))
...@@ -3692,7 +3694,9 @@ void rt6_sync_down_dev(struct net_device *dev, unsigned long event) ...@@ -3692,7 +3694,9 @@ void rt6_sync_down_dev(struct net_device *dev, unsigned long event)
{ {
struct arg_netdev_event arg = { struct arg_netdev_event arg = {
.dev = dev, .dev = dev,
{
.event = event, .event = event,
},
}; };
fib6_clean_all(dev_net(dev), fib6_ifdown, &arg); fib6_clean_all(dev_net(dev), fib6_ifdown, &arg);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment