diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-28 00:14:01 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-28 03:00:08 +0100 |
| commit | 5339ab8b1dd82f14df168fb9bf59449f3e24b03d (patch) | |
| tree | 8abf0ccd062988c249cb098067f99dadebd61499 /net/ipv6/ip6_fib.c | |
| parent | ipv6: ndisc: Convert to dst_neigh_lookup() (diff) | |
| download | linux-5339ab8b1dd82f14df168fb9bf59449f3e24b03d.tar.xz linux-5339ab8b1dd82f14df168fb9bf59449f3e24b03d.zip | |
ipv6: fib: Convert fib6_age() to dst_neigh_lookup().
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>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index b82bcde53f7a..5b27fbcae346 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -1552,11 +1552,20 @@ static int fib6_age(struct rt6_info *rt, void *arg) time_after_eq(now, rt->dst.lastuse + gc_args.timeout)) { RT6_TRACE("aging clone %p\n", rt); return -1; - } else if ((rt->rt6i_flags & RTF_GATEWAY) && - (!(dst_get_neighbour_noref_raw(&rt->dst)->flags & NTF_ROUTER))) { - RT6_TRACE("purging route %p via non-router but gateway\n", - rt); - return -1; + } else if (rt->rt6i_flags & RTF_GATEWAY) { + struct neighbour *neigh; + __u8 neigh_flags = 0; + + 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++; } |