From e405df7e784a7f9b0720a0e3349ef14516379b4e Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 29 Jan 2019 20:07:49 -0500 Subject: [PATCH] zebra: some v6 attributes were being written twice Some v6 attributes for the netlink_route_build_singlepath code were being written two times for the NEXTHOP_TYPE_IPV6_IFINDEX nexthop type. Signed-off-by: Donald Sharp --- zebra/rt_netlink.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index ce2d25862d..b6ec7352ab 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -1150,23 +1150,6 @@ static void _netlink_route_build_singlepath(const char *routedesc, int bytelen, "nexthop via if %u(%u)", routedesc, nexthop->ifindex, nexthop->vrf_id); } - - if (nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX) { - if (cmd == RTM_NEWROUTE) { - if (!IN6_IS_ADDR_UNSPECIFIED(&nexthop->rmap_src.ipv6)) - addattr_l(nlmsg, req_size, RTA_PREFSRC, - &nexthop->rmap_src.ipv6, bytelen); - else if (!IN6_IS_ADDR_UNSPECIFIED(&nexthop->src.ipv6)) - addattr_l(nlmsg, req_size, RTA_PREFSRC, - &nexthop->src.ipv6, bytelen); - } - - if (IS_ZEBRA_DEBUG_KERNEL) - zlog_debug( - "netlink_route_multipath() (%s): " - "nexthop via if %u(%u)", - routedesc, nexthop->ifindex, nexthop->vrf_id); - } } /* This function takes a nexthop as argument and -- 2.39.5