From 9423a324bf67913f9dec4bafe1fcb28a7995c8f2 Mon Sep 17 00:00:00 2001 From: Sabrina Dubroca Date: Tue, 16 Aug 2016 16:26:58 +0200 Subject: [PATCH] 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: ec71cae0bb7b ("ila: Support for configuring ila to use netfilter hook") Signed-off-by: Sabrina Dubroca --- ip/ipila.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ip/ipila.c b/ip/ipila.c index d75c4629..843cc165 100644 --- a/ip/ipila.c +++ b/ip/ipila.c @@ -240,20 +240,21 @@ static int do_del(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) 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) return do_add(argc-1, argv+1); if (matches(*argv, "delete") == 0) return do_del(argc-1, argv+1); if (matches(*argv, "list") == 0) return do_list(argc-1, argv+1); - if (matches(*argv, "help") == 0) - usage(); fprintf(stderr, "Command \"%s\" is unknown, try \"ip ila help\".\n", *argv);