Commit 8e326289 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

neighbour: force neigh_invalidate when NUD_FAILED update is from admin 



In systems where neigh gc thresh holds are set to high values,
admin deleted neigh entries (eg ip neigh flush or ip neigh del) can
linger around in NUD_FAILED state for a long time until periodic gc kicks
in. This patch forces neigh_invalidate when NUD_FAILED neigh_update is
from an admin.

Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1a5046b

net/core/neighbour.c

+2 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,8 @@ 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)) &&

		if (((old & (NUD_INCOMPLETE | NUD_PROBE)) ||

		     (flags & NEIGH_UPDATE_F_ADMIN)) &&

		    (new & NUD_FAILED)) {

			neigh_invalidate(neigh);

			notify = 1;