korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-12-11 18:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

ip: (ipvlan) introduce L3s mode

Browse Source 
The new mode 'l3s' can be set like -

  ip link add link <master> dev <IPvlan-slave> type ipvlan mode l3s

  e.g. ip link add link eth0 dev ipvl0 type ipvlan mode l3s

Also did some trivial code restructuring.

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
This commit is contained in:
Mahesh Bandewar 2016-09-19 14:39:40 -07:00 committed by Stephen Hemminger
parent e8a67bc4cf
commit b7c1488034
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ip/iplink_ipvlan.c
View File

@ -20,18 +20,7 @@
static void ipvlan_explain(FILE *f)
{
fprintf(f, "Usage: ... ipvlan [ mode { l2 | l3 } ]\n");
}
static void explain(void)
{
ipvlan_explain(stderr);
}
static int mode_arg(void)
{
fprintf(stderr, "Error: argument of \"mode\" must be either \"l2\", or \"l3\"\n");
return -1;
fprintf(f, "Usage: ... ipvlan [ mode { l2 | l3 | l3s } ]\n");
}
static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv,
@ -47,20 +36,24 @@ static int ipvlan_parse_opt(struct link_util *lu, int argc, char **argv,
mode = IPVLAN_MODE_L2;
else if (strcmp(*argv, "l3") == 0)
mode = IPVLAN_MODE_L3;
else
return mode_arg();
else if (strcmp(*argv, "l3s") == 0)
mode = IPVLAN_MODE_L3S;
else {
fprintf(stderr, "Error: argument of \"mode\" must be either \"l2\", \"l3\" or \"l3s\"\n");
return -1;
}
addattr16(n, 1024, IFLA_IPVLAN_MODE, mode);
} else if (matches(*argv, "help") == 0) {
explain();
ipvlan_explain(stderr);
return -1;
} else {
fprintf(stderr, "ipvlan: unknown option \"%s\"?\n",
*argv);
explain();
ipvlan_explain(stderr);
return -1;
}
argc--, argv++;
argc--;
argv++;
}
return 0;
@ -78,7 +71,8 @@ static void ipvlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
fprintf(f, " mode %s ",
mode == IPVLAN_MODE_L2 ? "l2" :
mode == IPVLAN_MODE_L3 ? "l3" : "unknown");
mode == IPVLAN_MODE_L3 ? "l3" :
mode == IPVLAN_MODE_L3S ? "l3s" : "unknown");
}
}
}