commit 75e8727fbb3749075b6df36be636a3045ed9d515 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

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

Linus Torvalds 20 years ago 75e8727f d3e5d291

+1 -1

1 changed file

expand all

unified split

net

decnet

dn_neigh.c

+1 -1

net/decnet/dn_neigh.c

··· 148 149 __neigh_parms_put(neigh->parms); 150 neigh->parms = neigh_parms_clone(parms); 151 - rcu_read_unlock(); 152 153 if (dn_db->use_long) 154 neigh->ops = &dn_long_ops; 155 else 156 neigh->ops = &dn_short_ops; 157 158 if (dn->flags & DN_NDFLAG_P3) 159 neigh->ops = &dn_phase3_ops;

··· 148 149 __neigh_parms_put(neigh->parms); 150 neigh->parms = neigh_parms_clone(parms); 151 152 if (dn_db->use_long) 153 neigh->ops = &dn_long_ops; 154 else 155 neigh->ops = &dn_short_ops; 156 + rcu_read_unlock(); 157 158 if (dn->flags & DN_NDFLAG_P3) 159 neigh->ops = &dn_phase3_ops;