From 31bb473e24a36f8da5887e101a636ce73c5723ab 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?= <yoshfuji@linux-ipv6.org>
Date: Mon, 21 Jan 2013 09:58:50 +0000
Subject: [PATCH] --- yaml --- r: 351546 b: refs/heads/master c:
 b820bb6b996966d93a5442b5fbf803ea58e7f487 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/route.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e8e05dcc721b..6af59595b48d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 100204147be9a2b87be2b118959b12eeaf8ef5d0
+refs/heads/master: b820bb6b996966d93a5442b5fbf803ea58e7f487
diff --git a/trunk/net/ipv6/route.c b/trunk/net/ipv6/route.c
index 2d94d5a7a051..f3328bc1174f 100644
--- a/trunk/net/ipv6/route.c
+++ b/trunk/net/ipv6/route.c
@@ -492,10 +492,10 @@ static void rt6_probe(struct rt6_info *rt)
 		struct in6_addr mcaddr;
 		struct in6_addr *target;
 
-		neigh->updated = jiffies;
-
-		if (neigh)
+		if (neigh) {
+			neigh->updated = jiffies;
 			write_unlock(&neigh->lock);
+		}
 
 		target = (struct in6_addr *)&rt->rt6i_gateway;
 		addrconf_addr_solict_mult(target, &mcaddr);