Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (75e8727f) · Commits · e / devices / android_kernel_oneplus_sm8150

net/decnet/dn_neigh.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;