Revert "bgpd: BGP session not established for ipv6 link local address with vrf config"

This reverts commit 0b6d353.

Author: ton31337

bgpd/bgp_network.c

@@ -660,10 +660,6 @@ static int bgp_update_address(struct interface *ifp, const union sockunion *dst,
 		return 1;
 
 	prefix2sockunion(sel, addr);
-
-	if (IN6_IS_ADDR_LINKLOCAL(&addr->sin6.sin6_addr))
-		addr->sin6.sin6_scope_id = ifp->ifindex;
-
 	return 0;
 }
 

bgpd/bgp_zebra.c

@@ -748,9 +748,6 @@ bool bgp_zebra_nexthop_set(union sockunion *local, union sockunion *remote,
 								? peer->conf_if
 								: peer->ifname,
 							peer->bgp->vrf_id);
-			else if (peer->update_if)
-				ifp = if_lookup_by_name(peer->update_if,
-							peer->bgp->vrf_id);
 		} else if (peer->update_if)
 			ifp = if_lookup_by_name(peer->update_if,
 						peer->bgp->vrf_id);