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

link_xfrm: don't force to set phydev 

Since linux commit 22d6552f827e ("xfrm interface: fix management of
phydev"), phydev is not mandatory anymore.

Note that it also could be useful before the above commit to not force the
user to put a phydev (the kernel was checking it anyway).
For example, it was useful to not set it in case of x-netns, because the
phydev is not available in the current netns:

Before the patch:
$ ip netns add foo
$ ip link add xfrm1 type xfrm dev eth1 if_id 1
$ ip link set xfrm1 netns foo
$ ip -n foo link set xfrm1 type xfrm dev eth1 if_id 2
Cannot find device "eth1"
$ ip -n foo link set xfrm1 type xfrm if_id 2
must specify physical device

Fixes: 286446c1e8 ("ip: support for xfrm interfaces")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Matt Ellison <matt@arroyo.io>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Nicolas Dichtel 2019-09-16 17:36:27 +02:00 committed by Stephen Hemminger
parent 6296d51825
commit 80d0e62673
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ip/link_xfrm.c
View File

@ -17,7 +17,7 @@ static void xfrm_print_help(struct link_util *lu, int argc, char **argv,
FILE *f) FILE *f)
{ {
fprintf(f, fprintf(f,
"Usage: ... %-4s dev PHYS_DEV [ if_id IF-ID ]\n" "Usage: ... %-4s dev [ PHYS_DEV ] [ if_id IF-ID ]\n"
"\n" "\n"
"Where: IF-ID := { 0x0..0xffffffff }\n", "Where: IF-ID := { 0x0..0xffffffff }\n",
lu->id); lu->id);
@ -46,12 +46,8 @@ static int xfrm_parse_opt(struct link_util *lu, int argc, char **argv,
argc--; argv++; argc--; argv++;
} }
if (link) { if (link)
addattr32(n, 1024, IFLA_XFRM_LINK, link); addattr32(n, 1024, IFLA_XFRM_LINK, link);
} else {
fprintf(stderr, "must specify physical device\n");
return -1;
}
return 0; return 0;
} }