projects/linux·commit 75e8727f

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

75e8727f · Linus Torvalds <[email protected]> · 2005-08-17 13:09:38 -07:00

Commit
75e8727fbb3749075b6df36be636a3045ed9d515
Parents
d3e5d291 · 1f07247d

Merge commit. Changes below are compared with the first parent: d3e5d291.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
net/decnet/dn_neigh.cmodified+1−1View file

net/decnet/dn_neigh.c

View file
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 @@ 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;