diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 13:09:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-17 13:09:38 -0700 |
| commit | 75e8727fbb3749075b6df36be636a3045ed9d515 (patch) | |
| tree | 1c2b9954c8c9d3f284defbd3910db6604e977e8d | |
| parent | d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b (diff) | |
| parent | 1f07247de51efd30c88ad8e3e06a8b5382fc7d35 (diff) | |
| download | linux-3.10-75e8727fbb3749075b6df36be636a3045ed9d515.tar.gz linux-3.10-75e8727fbb3749075b6df36be636a3045ed9d515.tar.bz2 linux-3.10-75e8727fbb3749075b6df36be636a3045ed9d515.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
| -rw-r--r-- | net/decnet/dn_neigh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index f32dba9e26f..8d0cc3cf3e4 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c @@ -148,12 +148,12 @@ static int dn_neigh_construct(struct neighbour *neigh) __neigh_parms_put(neigh->parms); neigh->parms = neigh_parms_clone(parms); - rcu_read_unlock(); if (dn_db->use_long) neigh->ops = &dn_long_ops; else neigh->ops = &dn_short_ops; + rcu_read_unlock(); if (dn->flags & DN_NDFLAG_P3) neigh->ops = &dn_phase3_ops; |