forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ipv6: fib: Convert fib6_age() to dst_neigh_lookup().

Browse source 
In this specific situation we know we are dealing with a gatewayed route
and therefore rt6i_gateway is not going to be in6addr_any even in future
interpretations.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-01-27 15:14:01 -08:00
commit 5339ab8b1d
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
net/ipv6/ip6_fib.c
View file

@ -1552,11 +1552,20 @@ static int fib6_age(struct rt6_info *rt, void *arg)
time_after_eq(now, rt->dst.lastuse + gc_args.timeout)) { time_after_eq(now, rt->dst.lastuse + gc_args.timeout)) {
RT6_TRACE("aging clone %p\n", rt); RT6_TRACE("aging clone %p\n", rt);
return -1; return -1;
} else if ((rt->rt6i_flags & RTF_GATEWAY) && } else if (rt->rt6i_flags & RTF_GATEWAY) {
(!(dst_get_neighbour_noref_raw(&rt->dst)->flags & NTF_ROUTER))) { struct neighbour *neigh;
RT6_TRACE("purging route %p via non-router but gateway\n", __u8 neigh_flags = 0;
rt);
return -1; neigh = dst_neigh_lookup(&rt->dst, &rt->rt6i_gateway);
if (neigh) {
neigh_flags = neigh->flags;
neigh_release(neigh);
}
if (neigh_flags & NTF_ROUTER) {
RT6_TRACE("purging route %p via non-router but gateway\n",
rt);
return -1;
}
} }
gc_args.more++; gc_args.more++;
} }