Merge "Revert "net: core: fix for ipv6 neigh"" (e96b6e71) · Commits · e / devices / android_kernel_fairphone_FP3

net/core/neighbour.c

+4 −10

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

		if (!(state & NUD_IN_TIMER)) {
		if (neigh_probe_enable && (state & NUD_STALE))
		neigh_dbg(2, "neigh %pK is still alive\n", neigh);
		else
		if (!(state & NUD_IN_TIMER))
		goto out;
		}

		if (state & NUD_REACHABLE) {
		if (time_before_eq(now,
		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);
		if (new & NUD_PROBE)
		atomic_set(&neigh->probes, 0);
		if (new & NUD_IN_TIMER \|\| (
		neigh_probe_enable &&
		(neigh->tbl->family == AF_INET6) &&
		(new & NUD_STALE)))
		if (new & NUD_IN_TIMER)
		neigh_add_timer(neigh, (jiffies +
		((new & NUD_REACHABLE) ?
		neigh->parms->reachable_time :