From 40f522b35bb4ef08f60078535c9a8b5e356bc0b1 Mon Sep 17 00:00:00 2001 From: "Roy.Li" Date: Mon, 3 Oct 2011 19:43:35 +0000 Subject: [PATCH] --- yaml --- r: 266831 b: refs/heads/master c: 01b7806cdce3d3cf1626a1e79389f30512703069 h: refs/heads/master i: 266829: 0939b3c3ab23eca6b462b15b4048205d0bfc3e70 266827: 2e50cb8d296c27e2faf3c0ea8b52dff4e2b13dc0 266823: e5bdefee874c37019b36853383ab1f7f7e91634f 266815: dbac025f34cda9fc503c4d50574a9a491dbeb8cf v: v3 --- [refs] | 2 +- trunk/net/ipv6/ndisc.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f23d304adbc6..fdeb90a9ca3f 100644 --- 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 index 1f52dd257631..7968bfec6138 100644 --- 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) {