openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipv6: Do not depend on rt->n in rt6_probe(). 

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 / 吉藤英明 2013-01-17 12:53:43 +00:00 committed by David S. Miller
parent 145a36217a
commit 2152caea71
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/ipv6/route.c
View File

@ -498,28 +498,34 @@ static void rt6_probe(struct rt6_info *rt)
* Router Reachability Probe MUST be rate-limited * Router Reachability Probe MUST be rate-limited
* to no more than one per minute. * to no more than one per minute.
*/ */
neigh = rt ? rt->n : NULL; if (!rt || !(rt->rt6i_flags & RTF_GATEWAY))
if (!neigh)
return;
write_lock_bh(&neigh->lock);
if (neigh->nud_state & NUD_VALID) {
write_unlock_bh(&neigh->lock);
return; return;
rcu_read_lock_bh();
neigh = __ipv6_neigh_lookup_noref(rt->dst.dev, &rt->rt6i_gateway);
if (neigh) {
write_lock(&neigh->lock);
if (neigh->nud_state & NUD_VALID)
goto out;
} }
if (!(neigh->nud_state & NUD_VALID) &&
if (!neigh ||
time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) { time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) {
struct in6_addr mcaddr; struct in6_addr mcaddr;
struct in6_addr *target; struct in6_addr *target;
neigh->updated = jiffies; neigh->updated = jiffies;
write_unlock_bh(&neigh->lock);
target = (struct in6_addr *)&neigh->primary_key; if (neigh)
write_unlock(&neigh->lock);
target = (struct in6_addr *)&rt->rt6i_gateway;
addrconf_addr_solict_mult(target, &mcaddr); addrconf_addr_solict_mult(target, &mcaddr);
ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL); ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL);
} else { } else {
write_unlock_bh(&neigh->lock); out:
write_unlock(&neigh->lock);
} }
rcu_read_unlock_bh();
} }
#else #else
static inline void rt6_probe(struct rt6_info *rt) static inline void rt6_probe(struct rt6_info *rt)