From f3f339e9590a50a0a75be88f6e32c227e8623b25 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 26 Oct 2016 11:19:11 -0700 Subject: [PATCH] cleanup debris from revert Last revert didn't come out clean. --- ip/iplink_macvlan.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ip/iplink_macvlan.c b/ip/iplink_macvlan.c index 413254519..83ff961b1 100644 --- a/ip/iplink_macvlan.c +++ b/ip/iplink_macvlan.c @@ -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", -- 2.47.2