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-03-02 09:41:28 -08:00
parent 05d4f64d4a e897776690
commit da60d03136
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ip/ipl2tp.c
View File

@ -720,6 +720,9 @@ static int do_show(int argc, char **argv)
int do_ipl2tp(int argc, char **argv) int do_ipl2tp(int argc, char **argv)
{ {
if (argc < 1 || !matches(*argv, "help"))
usage();
if (genl_family < 0) { if (genl_family < 0) {
if (rtnl_open_byproto(&genl_rth, 0, NETLINK_GENERIC) < 0) { if (rtnl_open_byproto(&genl_rth, 0, NETLINK_GENERIC) < 0) {
fprintf(stderr, "Cannot open generic netlink socket\n"); fprintf(stderr, "Cannot open generic netlink socket\n");
@ -731,9 +734,6 @@ int do_ipl2tp(int argc, char **argv)
exit(1); exit(1);
} }
if (argc < 1)
usage();
if (matches(*argv, "add") == 0) if (matches(*argv, "add") == 0)
return do_add(argc-1, argv+1); return do_add(argc-1, argv+1);
if (matches(*argv, "delete") == 0) if (matches(*argv, "delete") == 0)
@ -742,8 +742,6 @@ int do_ipl2tp(int argc, char **argv)
matches(*argv, "lst") == 0 || matches(*argv, "lst") == 0 ||
matches(*argv, "list") == 0) matches(*argv, "list") == 0)
return do_show(argc-1, argv+1); return do_show(argc-1, argv+1);
if (matches(*argv, "help") == 0)
usage();
fprintf(stderr, "Command \"%s\" is unknown, try \"ip l2tp help\".\n", *argv); fprintf(stderr, "Command \"%s\" is unknown, try \"ip l2tp help\".\n", *argv);
exit(-1); exit(-1);