From 932e33f33cf2a19ac5fa4295535b6b0e20c61890 Mon Sep 17 00:00:00 2001 From: Vincent Guo Date: Thu, 25 Aug 2016 17:50:10 +0800 Subject: [PATCH] kni: bug fix in module_init and module_exit unregister_XXX should be called when module exits or error occurs during module init, but register_XXX is called in case that HAVE_SIMPLIFIED_PERNET_OPERATIONS is not set. --- lib/librte_eal/linuxapp/kni/kni_misc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c index 67e9b7d..d7850be 100644 --- a/lib/librte_eal/linuxapp/kni/kni_misc.c +++ b/lib/librte_eal/linuxapp/kni/kni_misc.c @@ -194,7 +194,7 @@ out: #ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS unregister_pernet_subsys(&kni_net_ops); #else -register_pernet_gen_subsys(&kni_net_id, &kni_net_ops); +unregister_pernet_gen_subsys(kni_net_id, &kni_net_ops); #endif return rc; } @@ -206,7 +206,7 @@ kni_exit(void) #ifdef HAVE_SIMPLIFIED_PERNET_OPERATIONS unregister_pernet_subsys(&kni_net_ops); #else -register_pernet_gen_subsys(&kni_net_id, &kni_net_ops); +unregister_pernet_gen_subsys(kni_net_id, &kni_net_ops); #endif KNI_PRINT("####### DPDK kni module unloaded #######\n"); } -- 1.7.1&fVaj(8n6]M6^z۫)Z\d^qyiַ\iַ\m]񼝥(DLמ|+uݥ(n@ ׭w4M!Mz+u)={fj)ibajvrٱاfv)vaj(]9]ȧ2ҿ]\^@DR۞ć8۞۞ bz{\zb~'ު笵[luaj(,+a#=(߀6]Ӵn@ ׭u4M4DE~&n)()Z"j)ޞྙ_yjk6aj(]7}弢ٱاfv)vaj(x5"13vMv~6^N4:zޮ(")zW(zqrGzxhrX2mܢg^]Eޭz&C8rI