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

Merge branch 'main' into next 

Conflicts:
	ip/ipneigh.c

Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
David Ahern 2021-10-09 17:47:47 -06:00
parent 763fd793fe 897772a735
commit 8cd517a805
13 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ip/ipmptcp.c
View File

@ -278,7 +278,7 @@ static int mptcp_addr_dump(void)
return -2; return -2;
} }
close_json_object(); delete_json_obj();
fflush(stdout); fflush(stdout);
return 0; return 0;
} }

5
lib/bpf_legacy.c
View File

@ -533,9 +533,12 @@ static int bpf_mnt_check_target(const char *target)
int ret; int ret;
ret = mkdir(target, S_IRWXU); ret = mkdir(target, S_IRWXU);
if (ret && errno != EEXIST) if (ret) {
if (errno == EEXIST)
return 0;
fprintf(stderr, "mkdir %s failed: %s\n", target, fprintf(stderr, "mkdir %s failed: %s\n", target,
strerror(errno)); strerror(errno));
}
return ret; return ret;
} }

2
tc/f_flower.c
View File

@ -725,7 +725,7 @@ static int flower_parse_port(char *str, __u8 ip_proto,
if (min && max) { if (min && max) {
__be16 min_port_type, max_port_type; __be16 min_port_type, max_port_type;
if (max <= min) { if (ntohs(max) <= ntohs(min)) {
fprintf(stderr, "max value should be greater than min value\n"); fprintf(stderr, "max value should be greater than min value\n");
return -1; return -1;
} }