From 257d822f8f4d945ae3ef6f0d4cf198ab8c673589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Thu, 17 Jan 2013 12:53:02 +0000 Subject: [PATCH] --- yaml --- r: 351435 b: refs/heads/master c: 7ff74a596b6aa47ccc71f6b9a26006af69d0e33f h: refs/heads/master i: 351433: ed6e6dd67dfa64abd08b418a0ca7b5f734ad42e2 351431: 553e711408cd8bdbfc502fc81fd9b272ccae0274 v: v3 --- [refs] | 2 +- trunk/net/ipv6/route.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0c222bff0576..aeb3eb53aa29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbf1de72324a8105ddcc3d9ce9acbc613faea17e +refs/heads/master: 7ff74a596b6aa47ccc71f6b9a26006af69d0e33f diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c index 7c34c01b515b..1341f68e8009 100644 --- a/trunk/net/ipv6/route.c +++ b/trunk/net/ipv6/route.c @@ -499,22 +499,26 @@ static void rt6_probe(struct rt6_info *rt) * to no more than one per minute. */ neigh = rt ? rt->n : NULL; - if (!neigh || (neigh->nud_state & NUD_VALID)) + if (!neigh) + return; + write_lock_bh(&neigh->lock); + if (neigh->nud_state & NUD_VALID) { + write_unlock_bh(&neigh->lock); return; - read_lock_bh(&neigh->lock); + } if (!(neigh->nud_state & NUD_VALID) && time_after(jiffies, neigh->updated + rt->rt6i_idev->cnf.rtr_probe_interval)) { struct in6_addr mcaddr; struct in6_addr *target; neigh->updated = jiffies; - read_unlock_bh(&neigh->lock); + write_unlock_bh(&neigh->lock); target = (struct in6_addr *)&neigh->primary_key; addrconf_addr_solict_mult(target, &mcaddr); ndisc_send_ns(rt->dst.dev, NULL, target, &mcaddr, NULL); } else { - read_unlock_bh(&neigh->lock); + write_unlock_bh(&neigh->lock); } } #else