Merge "net: core: Fix to update the neigh entry correctly" (5dc0bbe1) · Commits · e / devices / android_kernel_xiaomi_markw

net/core/neighbour.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -1294,17 +1294,14 @@ struct neighbour neigh_event_ns(struct neigh_table tbl,
		struct neighbour *neigh = __neigh_lookup(tbl, saddr, dev,
		lladdr \|\| !dev->addr_len);
		if (neigh) {
		if (neigh_probe_enable) {
		if (!(neigh->nud_state == NUD_REACHABLE)) {
		neigh_update(neigh, lladdr, NUD_STALE,
		NEIGH_UPDATE_F_OVERRIDE);
		if (neigh_probe_enable) {
		if (!(neigh->nud_state == NUD_REACHABLE)) {
		write_lock(&neigh->lock);
		neigh_probe(neigh);
		neigh_update_notify(neigh);
		}
		} else {
		neigh_update(neigh, lladdr, NUD_STALE,
		NEIGH_UPDATE_F_OVERRIDE);
		}
		}
		return neigh;