Revert "net: core: fix for ipv6 neigh"
This reverts commit bead64699981b07e59ce3154cb57be3f2ef38303.
Double timer is getting attached in some scenarios.
Unable to delete bridge as timer is not deleted.
Change-Id: I3b830f9666b93c39c64f7b16fe13f1fc79d17abd
Acked-by: Suraj Jaiswal <c_surajj@qti.qualcomm.com>
Signed-off-by: Mohammed Javid <mjavid@codeaurora.org>
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 59c1581..340a3db 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -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
- goto out;
- }
+ 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 :