From 688f9aa4f24ffac148f6b4127602f10a7837d4ba Mon Sep 17 00:00:00 2001 From: Sabrina Dubroca Date: Tue, 16 Aug 2016 16:26:56 +0200 Subject: [PATCH] macsec: show usage even if the module is not available Currently, the `ip macsec` 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: b26fc590ce62 ("ip: add MACsec support") Signed-off-by: Sabrina Dubroca --- ip/ipmacsec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ip/ipmacsec.c b/ip/ipmacsec.c index 9eabfe24..6bd1f54f 100644 --- a/ip/ipmacsec.c +++ b/ip/ipmacsec.c @@ -986,15 +986,15 @@ static int do_show(int argc, char **argv) int do_ipmacsec(int argc, char **argv) { - if (genl_init_handle(&genl_rth, MACSEC_GENL_NAME, &genl_family)) - exit(1); - if (argc < 1) ipmacsec_usage(); if (matches(*argv, "help") == 0) ipmacsec_usage(); + if (genl_init_handle(&genl_rth, MACSEC_GENL_NAME, &genl_family)) + exit(1); + if (matches(*argv, "show") == 0) return do_show(argc-1, argv+1);