---

yaml --- r: 266831 b: refs/heads/master c: 01b7806 h: refs/heads/master i: 266829: 0939b3c 266827: 2e50cb8 266823: e5bdefe 266815: dbac025 v: v3
git-mirror · Oct 17, 2011 · 40f522b · 40f522b
1 parent 9b310dc
commit 40f522b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f861c2b80c45954e1ea04ead24cafcb1806dd536
+refs/heads/master: 01b7806cdce3d3cf1626a1e79389f30512703069
diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c
@@ -370,17 +370,14 @@ static int ndisc_constructor(struct neighbour *neigh)
 	struct neigh_parms *parms;
 	int is_multicast = ipv6_addr_is_multicast(addr);
 
-	rcu_read_lock();
 	in6_dev = in6_dev_get(dev);
 	if (in6_dev == NULL) {
-		rcu_read_unlock();
 		return -EINVAL;
 	}
 
 	parms = in6_dev->nd_parms;
 	__neigh_parms_put(neigh->parms);
 	neigh->parms = neigh_parms_clone(parms);
-	rcu_read_unlock();
 
 	neigh->type = is_multicast ? RTN_MULTICAST : RTN_UNICAST;
 	if (!dev->header_ops) {