Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ddef044 authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6]: ROUTE: Clean up rt6_select() code path in ip6_route_{intput,output}(). 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 118f8c16

net/ipv6/route.c

+7 −26
Original line number Diff line number Diff line
@@ -426,18 +426,12 @@ void ip6_route_input(struct sk_buff *skb) 
restart:

	rt = fn->leaf;



	if ((rt->rt6i_flags & RTF_CACHE)) {

	rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);

	if (rt == &ip6_null_entry)

		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);

	BACKTRACK();

	if ((rt->rt6i_flags & RTF_CACHE))

		goto out;

	}



	rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);

	if (rt == &ip6_null_entry)

		rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);

	BACKTRACK();



	dst_hold(&rt->u.dst);

	read_unlock_bh(&rt6_lock);
@@ -498,25 +492,12 @@ struct dst_entry * ip6_route_output(struct sock *sk, struct flowi *fl) 
	fn = fib6_lookup(&ip6_routing_table, &fl->fl6_dst, &fl->fl6_src);



restart:

	rt = fn->leaf;



	if ((rt->rt6i_flags & RTF_CACHE)) {

	rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);

	if (rt == &ip6_null_entry)

		rt = rt6_select(&fn->leaf, fl->oif, strict);

	BACKTRACK();

	if ((rt->rt6i_flags & RTF_CACHE))

		goto out;

	}

	if (rt->rt6i_flags & RTF_DEFAULT) {

		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);

		if (rt == &ip6_null_entry)

			rt = rt6_select(&fn->leaf, fl->oif, strict);

	} else {

		rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);

		if (rt == &ip6_null_entry)

			rt = rt6_select(&fn->leaf, fl->oif, strict);

		BACKTRACK();

	}



	dst_hold(&rt->u.dst);

	read_unlock_bh(&rt6_lock);