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 <sharpd@cumulusnetworks.com>

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index ce2d25862d0695d3f23b9be6475a36639100fd5c..b6ec7352ab8575bb71623456043899f11e94af64 100644 (file)
--- 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