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 2016-09-20 09:50:53 -07:00
parent b7c1488034 f20f5f7990
commit 36923f4e69
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ip/iplink_vxlan.c
View File

@ -266,6 +266,11 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
return -1; return -1;
} }
if ((gaddr || !IN6_IS_ADDR_UNSPECIFIED(&gaddr6)) && !link) {
fprintf(stderr, "vxlan: 'group' requires 'dev' to be specified\n");
return -1;
}
if (!dst_port_set && gpe) { if (!dst_port_set && gpe) {
dstport = 4790; dstport = 4790;
} else if (!dst_port_set) { } else if (!dst_port_set) {

4
ip/ipmacsec.c
View File

@ -152,9 +152,9 @@ static void get_icvlen(__u8 *icvlen, char *arg)
if (ret) if (ret)
invarg("expected ICV length", arg); invarg("expected ICV length", arg);
if (*icvlen < MACSEC_MIN_ICV_LEN || *icvlen > MACSEC_MAX_ICV_LEN) if (*icvlen < MACSEC_MIN_ICV_LEN || *icvlen > MACSEC_STD_ICV_LEN)
invarg("ICV length must be in the range {" invarg("ICV length must be in the range {"
STR(MACSEC_MIN_ICV_LEN) ".." STR(MACSEC_MAX_ICV_LEN) STR(MACSEC_MIN_ICV_LEN) ".." STR(MACSEC_STD_ICV_LEN)
"}", arg); "}", arg);
} }

2
tc/tc_util.c
View File

@ -82,7 +82,7 @@ int get_qdisc_handle(__u32 *h, const char *str)
if (strcmp(str, "none") == 0) if (strcmp(str, "none") == 0)
goto ok; goto ok;
maj = strtoul(str, &p, 16); maj = strtoul(str, &p, 16);
if (p == str) if (p == str || maj >= (1 << 16))
return -1; return -1;
maj <<= 16; maj <<= 16;
if (*p != ':' && *p != 0) if (*p != ':' && *p != 0)