Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cecbb639 authored by David S. Miller's avatar David S. Miller
Browse files

[NEIGH]: Revert 'Fix race between neigh_parms_release and neightbl_fill_parms' 

Commit 9cd40029 (Fix race between
neigh_parms_release and neightbl_fill_parms) introduced device
reference counting regressions for several people, see:

	http://bugzilla.kernel.org/show_bug.cgi?id=9778



for example.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2dc2f207

net/core/neighbour.c

+2 −2
Original line number Diff line number Diff line
@@ -1316,6 +1316,8 @@ void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms) 
			*p = parms->next;

			parms->dead = 1;

			write_unlock_bh(&tbl->lock);

			if (parms->dev)

				dev_put(parms->dev);

			call_rcu(&parms->rcu_head, neigh_rcu_free_parms);

			return;

		}
@@ -1326,8 +1328,6 @@ void neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *parms) 


void neigh_parms_destroy(struct neigh_parms *parms)

{

	if (parms->dev)

		dev_put(parms->dev);

	kfree(parms);

}