| Message ID | 1497583912-27981-1-git-send-email-liuhangbin@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
On Fri, 16 Jun 2017 11:31:52 +0800 Hangbin Liu <liuhangbin@gmail.com> wrote: > After upstream commit 5071034e4af7 ('neigh: Really delete an arp/neigh entry > on "ip neigh delete" or "arp -d"'), we could delete a single FAILED neighbour > entry now. But `ip neigh flush` still skip the FAILED entry. > > Move the filter after first round flush so we can flush FAILED entry on fixed > kernel and also do not keep retrying on old kernel. > > Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Applied, thanks.
diff --git a/ip/ipneigh.c b/ip/ipneigh.c index 4d8fc85..9c38a60 100644 --- a/ip/ipneigh.c +++ b/ip/ipneigh.c @@ -445,7 +445,6 @@ static int do_show_or_flush(int argc, char **argv, int flush) filter.flushb = flushb; filter.flushp = 0; filter.flushe = sizeof(flushb); - filter.state &= ~NUD_FAILED; while (round < MAX_ROUNDS) { if (rtnl_dump_request_n(&rth, &req.n) < 0) { @@ -474,6 +473,7 @@ static int do_show_or_flush(int argc, char **argv, int flush) printf("\n*** Round %d, deleting %d entries ***\n", round, filter.flushed); fflush(stdout); } + filter.state &= ~NUD_FAILED; } printf("*** Flush not complete bailing out after %d rounds\n", MAX_ROUNDS);
After upstream commit 5071034e4af7 ('neigh: Really delete an arp/neigh entry on "ip neigh delete" or "arp -d"'), we could delete a single FAILED neighbour entry now. But `ip neigh flush` still skip the FAILED entry. Move the filter after first round flush so we can flush FAILED entry on fixed kernel and also do not keep retrying on old kernel. Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> --- ip/ipneigh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)