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

cleanup debris from revert 

Last revert didn't come out clean.
This commit is contained in:
Stephen Hemminger 2016-10-26 11:19:11 -07:00
parent c07a36c3db
commit f3f339e959
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ip/iplink_macvlan.c
View File

@ -39,16 +39,8 @@ static void explain(struct link_util *lu)
print_explain(lu, stderr);
}
static int mode_arg(const char *arg)
{
<<<<<<< HEAD
fprintf(stderr,
"Error: argument of \"mode\" must be \"private\", \"vepa\", \"bridge\", \"passthru\" or \"source\", not \"%s\"\n",
arg);
return -1;
}
static int flag_arg(const char *arg)
static int mode_arg(const char *arg)
{
fprintf(stderr,
"Error: argument of \"mode\" must be \"private\", \"vepa\", \"bridge\" or \"passthru\", not \"%s\"\n",