Commit d2fb4fb8 authored Oct 20, 2018 by Roopa Prabhu Committed by David S. Miller Oct 20, 2018

Revert "neighbour: force neigh_invalidate when NUD_FAILED update is from admin"



This reverts commit 8e326289.

This patch results in unnecessary netlink notification when one
tries to delete a neigh entry already in NUD_FAILED state. Found
this with a buggy app that tries to delete a NUD_FAILED entry
repeatedly. While the notification issue can be fixed with more
checks, adding more complexity here seems unnecessary. Also,
recent tests with other changes in the neighbour code have
shown that the INCOMPLETE and PROBE checks are good enough for
the original issue.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4ba4c566

net/core/neighbour.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1148,8 +1148,7 @@ int neigh_update(struct neighbour neigh, const u8 lladdr, u8 new,
		neigh->nud_state = new;
		err = 0;
		notify = old & NUD_VALID;
		if (((old & (NUD_INCOMPLETE \| NUD_PROBE)) \|\|
		(flags & NEIGH_UPDATE_F_ADMIN)) &&
		if ((old & (NUD_INCOMPLETE \| NUD_PROBE)) &&
		(new & NUD_FAILED)) {
		neigh_invalidate(neigh);
		notify = 1;

Admin message