[net-next] ipv6: Fix build with gcc-4.4.5

Message ID 20180112200736.24786-1-idosch@mellanox.com
State Accepted
Delegated to: David Miller
Headers show
Series
  • [net-next] ipv6: Fix build with gcc-4.4.5
Related show

Commit Message

Ido Schimmel Jan. 12, 2018, 8:07 p.m.
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: 4c981e28d373 ("ipv6: Prepare to handle multiple netdev events")
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Reported-by: Emil S Tantilov <emils.tantilov@gmail.com>
Tested-by: Emil S Tantilov <emils.tantilov@gmail.com>
---
 net/ipv6/route.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

David Miller Jan. 15, 2018, 7:28 p.m. | #1
From: Ido Schimmel <idosch@mellanox.com>
Date: Fri, 12 Jan 2018 22:07:36 +0200

> 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: 4c981e28d373 ("ipv6: Prepare to handle multiple netdev events")
> Signed-off-by: Ido Schimmel <idosch@mellanox.com>
> Reported-by: Emil S Tantilov <emils.tantilov@gmail.com>
> Tested-by: Emil S Tantilov <emils.tantilov@gmail.com>

Applied.

Patch

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 1076ae0ea9d5..c37bd9569172 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3583,7 +3583,9 @@  void rt6_sync_up(struct net_device *dev, unsigned int nh_flags)
 {
 	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 +3694,9 @@  void rt6_sync_down_dev(struct net_device *dev, unsigned long event)
 {
 	struct arg_netdev_event arg = {
 		.dev = dev,
-		.event = event,
+		{
+			.event = event,
+		},
 	};
 
 	fib6_clean_all(dev_net(dev), fib6_ifdown, &arg);