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

Commit e454b412 authored by Mohammed Javid's avatar Mohammed Javid Committed by Gerrit - the friendly Code Review server
Browse files

Revert "net: core: fix for ipv6 neigh" 



This reverts commit bead6469.

Double timer is getting attached in some scenarios.
Unable to delete bridge as timer is not deleted.

Change-Id: I3b830f9666b93c39c64f7b16fe13f1fc79d17abd
Acked-by: default avatarSuraj Jaiswal <c_surajj@qti.qualcomm.com>
Signed-off-by: default avatarMohammed Javid <mjavid@codeaurora.org>
parent ec09d4d9

net/core/neighbour.c

+4 −10
Original line number Original line Diff line number Diff line
@@ -889,12 +889,9 @@ static void neigh_timer_handler(unsigned long arg) 
	now = jiffies;

	now = jiffies;

	next = now + HZ;

	next = now + HZ;





	if (!(state & NUD_IN_TIMER)) {

	if (!(state & NUD_IN_TIMER))

		if (neigh_probe_enable && (state & NUD_STALE))

			neigh_dbg(2, "neigh %pK is still alive\n", neigh);

		else

		goto out;

		goto out;

	}



	if (state & NUD_REACHABLE) {

	if (state & NUD_REACHABLE) {

		if (time_before_eq(now,

		if (time_before_eq(now,

				   neigh->confirmed + neigh->parms->reachable_time)) {

				   neigh->confirmed + neigh->parms->reachable_time)) {
@@ -1185,10 +1182,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, 
		neigh_del_timer(neigh);

		neigh_del_timer(neigh);

		if (new & NUD_PROBE)

		if (new & NUD_PROBE)

			atomic_set(&neigh->probes, 0);

			atomic_set(&neigh->probes, 0);

		if (new & NUD_IN_TIMER || (

		if (new & NUD_IN_TIMER)

			neigh_probe_enable &&

			(neigh->tbl->family == AF_INET6) &&

			(new & NUD_STALE)))

			neigh_add_timer(neigh, (jiffies +

			neigh_add_timer(neigh, (jiffies +

						((new & NUD_REACHABLE) ?

						((new & NUD_REACHABLE) ?

						 neigh->parms->reachable_time :

						 neigh->parms->reachable_time :