Commit e021c329 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by Jakub Kicinski
Browse files

Revert "ip: fix dflt addr selection for connected nexthop" 

This reverts commit 747c1430.

As explained by Julian, nhc_scope is related to nhc_gw, not to the route.
Revert the original patch. The initial problem is fixed differently in the
next commit.

Link: https://lore.kernel.org/netdev/6c8a44ba-c2d5-cdf-c5c7-5baf97cba38@ssi.bg/


Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Reviewed-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 745b913a

net/ipv4/fib_semantics.c

+1 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,7 @@ static int fib_check_nh_nongw(struct net *net, struct fib_nh *nh, 


	nh->fib_nh_dev = in_dev->dev;

	netdev_hold(nh->fib_nh_dev, &nh->fib_nh_dev_tracker, GFP_ATOMIC);

	nh->fib_nh_scope = RT_SCOPE_LINK;

	nh->fib_nh_scope = RT_SCOPE_HOST;

	if (!netif_carrier_ok(nh->fib_nh_dev))

		nh->fib_nh_flags |= RTNH_F_LINKDOWN;

	err = 0;