mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-28 11:49:32 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2006-03-20 17:01:24 -08:00 committed by David S. Miller
parent 118f8c1654
commit 1ddef044ed
1 changed files with 7 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
net/ipv6/route.c
View file

@ -426,18 +426,12 @@ void ip6_route_input(struct sk_buff *skb)
restart: restart:
rt = fn->leaf; rt = fn->leaf;
if ((rt->rt6i_flags & RTF_CACHE)) {
rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE); rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict | RT6_SELECT_F_REACHABLE);
if (rt == &ip6_null_entry) if (rt == &ip6_null_entry)
rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict); rt = rt6_select(&fn->leaf, skb->dev->ifindex, strict);
BACKTRACK(); BACKTRACK();
if ((rt->rt6i_flags & RTF_CACHE))
goto out; 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); dst_hold(&rt->u.dst);
read_unlock_bh(&rt6_lock); 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); fn = fib6_lookup(&ip6_routing_table, &fl->fl6_dst, &fl->fl6_src);
restart: restart:
rt = fn->leaf;
if ((rt->rt6i_flags & RTF_CACHE)) {
rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE); rt = rt6_select(&fn->leaf, fl->oif, strict | RT6_SELECT_F_REACHABLE);
if (rt == &ip6_null_entry) if (rt == &ip6_null_entry)
rt = rt6_select(&fn->leaf, fl->oif, strict); rt = rt6_select(&fn->leaf, fl->oif, strict);
BACKTRACK(); BACKTRACK();
if ((rt->rt6i_flags & RTF_CACHE))
goto out; 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); dst_hold(&rt->u.dst);
read_unlock_bh(&rt6_lock); read_unlock_bh(&rt6_lock);