From 560cf612531ffa12fc10fc3fbbaee7dc5d8eafdc Mon Sep 17 00:00:00 2001 From: Serhey Popovych Date: Mon, 18 Dec 2017 19:48:05 +0200 Subject: [PATCH] link_vti6: Always add local/remote endpoint attributes All tunnels already support for parsing/adding zero endpoints and vti6 isn't an exception. This check was added as part of commit 2a80154fde40 (vti6: fix local/remote any addr handling) and looks too restrictive as purpose of change is to avoid endpoint configuration from uninitialized data. Signed-off-by: Serhey Popovych Signed-off-by: Stephen Hemminger --- ip/link_vti6.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ip/link_vti6.c b/ip/link_vti6.c index f631839aa..4136b0e7a 100644 --- a/ip/link_vti6.c +++ b/ip/link_vti6.c @@ -154,10 +154,8 @@ get_failed: addattr32(n, 1024, IFLA_VTI_IKEY, ikey); addattr32(n, 1024, IFLA_VTI_OKEY, okey); - if (memcmp(&saddr, &in6addr_any, sizeof(in6addr_any))) - addattr_l(n, 1024, IFLA_VTI_LOCAL, &saddr, sizeof(saddr)); - if (memcmp(&daddr, &in6addr_any, sizeof(in6addr_any))) - addattr_l(n, 1024, IFLA_VTI_REMOTE, &daddr, sizeof(daddr)); + addattr_l(n, 1024, IFLA_VTI_LOCAL, &saddr, sizeof(saddr)); + addattr_l(n, 1024, IFLA_VTI_REMOTE, &daddr, sizeof(daddr)); addattr32(n, 1024, IFLA_VTI_FWMARK, fwmark); if (link) addattr32(n, 1024, IFLA_VTI_LINK, link); -- 2.47.2