| commit | 75e8727fbb3749075b6df36be636a3045ed9d515 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Aug 17 13:09:38 2005 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Aug 17 13:09:38 2005 -0700 |
| tree | 1c2b9954c8c9d3f284defbd3910db6604e977e8d | |
| parent | d3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b [diff] | |
| parent | 1f07247de51efd30c88ad8e3e06a8b5382fc7d35 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c index f32dba9..8d0cc3c 100644 --- a/net/decnet/dn_neigh.c +++ b/net/decnet/dn_neigh.c
@@ -148,12 +148,12 @@ __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;