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

ila: show usage even if the module is not available 

Currently, the `ip ila` command tries to initialize a genl context
even when we just want to see the help for the command, which doesn't
require to talk to the kernel at all.

Delay genl initialization, which can fail if the module isn't loaded,
until the point where we will actually need it.

Fixes: ec71cae0bb ("ila: Support for configuring ila to use netfilter hook")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
This commit is contained in:
Sabrina Dubroca 2016-08-16 16:26:58 +02:00 committed by Stephen Hemminger
parent d240a0e174
commit 9423a324bf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ip/ipila.c
View File

@ -240,20 +240,21 @@ static int do_del(int argc, char **argv)
int do_ipila(int argc, char **argv) int do_ipila(int argc, char **argv)
{ {
if (genl_init_handle(&genl_rth, ILA_GENL_NAME, &genl_family))
exit(1);
if (argc < 1) if (argc < 1)
usage(); usage();
if (matches(*argv, "help") == 0)
usage();
if (genl_init_handle(&genl_rth, ILA_GENL_NAME, &genl_family))
exit(1);
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)
return do_del(argc-1, argv+1); return do_del(argc-1, argv+1);
if (matches(*argv, "list") == 0) if (matches(*argv, "list") == 0)
return do_list(argc-1, argv+1); return do_list(argc-1, argv+1);
if (matches(*argv, "help") == 0)
usage();
fprintf(stderr, "Command \"%s\" is unknown, try \"ip ila help\".\n", fprintf(stderr, "Command \"%s\" is unknown, try \"ip ila help\".\n",
*argv); *argv);