diff options
| author | Stephen Hemminger <stephen@networkplumber.org> | 2017-06-16 09:05:53 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2017-06-16 09:05:53 -0700 |
| commit | 236211a7634837c0b8a5ad03d94fbc0718a8981b (patch) | |
| tree | 39966eb0df42597e91830758d49c63eacbeec453 | |
| parent | be8b93e3e2e34147205af116aa4a331e8bb5c43a (diff) | |
| parent | e4319590f70b0b9ed2beebafaacb323ecf781e50 (diff) | |
| download | iproute2-236211a7634837c0b8a5ad03d94fbc0718a8981b.tar.gz | |
Merge branch 'master' into net-next
| -rw-r--r-- | ip/ipneigh.c | 2 | ||||
| -rw-r--r-- | ip/iproute_lwtunnel.c | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/ip/ipneigh.c b/ip/ipneigh.c index 4d8fc852..9c38a60d 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); diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c index 1395f033..5c0c7d11 100644 --- a/ip/iproute_lwtunnel.c +++ b/ip/iproute_lwtunnel.c @@ -19,13 +19,6 @@ #include <linux/ila.h> #include <linux/lwtunnel.h> #include <linux/mpls_iptunnel.h> - -#ifndef __USE_KERNEL_IPV6_DEFS -#define __USE_KERNEL_IPV6_DEFS -#endif -#include <linux/seg6.h> -#include <linux/seg6_iptunnel.h> -#include <linux/seg6_hmac.h> #include <errno.h> #include "rt_names.h" @@ -33,6 +26,10 @@ #include "iproute_lwtunnel.h" #include "bpf_util.h" +#include <linux/seg6.h> +#include <linux/seg6_iptunnel.h> +#include <linux/seg6_hmac.h> + static const char *format_encap_type(int type) { switch (type) { |