matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-06-16 09:05:53 -07:00
parent be8b93e3e2 e4319590f7
commit 236211a763
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ip/ipneigh.c
View File

@ -445,7 +445,6 @@ static int do_show_or_flush(int argc, char **argv, int flush)
filter.flushb = flushb; filter.flushb = flushb;
filter.flushp = 0; filter.flushp = 0;
filter.flushe = sizeof(flushb); filter.flushe = sizeof(flushb);
filter.state &= ~NUD_FAILED;
while (round < MAX_ROUNDS) { while (round < MAX_ROUNDS) {
if (rtnl_dump_request_n(&rth, &req.n) < 0) { 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); printf("\n*** Round %d, deleting %d entries ***\n", round, filter.flushed);
fflush(stdout); fflush(stdout);
} }
filter.state &= ~NUD_FAILED;
} }
printf("*** Flush not complete bailing out after %d rounds\n", printf("*** Flush not complete bailing out after %d rounds\n",
MAX_ROUNDS); MAX_ROUNDS);

11
ip/iproute_lwtunnel.c
View File

@ -19,13 +19,6 @@
#include <linux/ila.h> #include <linux/ila.h>
#include <linux/lwtunnel.h> #include <linux/lwtunnel.h>
#include <linux/mpls_iptunnel.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 <errno.h>
#include "rt_names.h" #include "rt_names.h"
@ -33,6 +26,10 @@
#include "iproute_lwtunnel.h" #include "iproute_lwtunnel.h"
#include "bpf_util.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) static const char *format_encap_type(int type)
{ {
switch (type) { switch (type) {