Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: nf_nat_h323: eliminate anonymous module_init & module_exit

Eliminate anonymous module_init() and module_exit(), which can lead to
confusion or ambiguity when reading System.map, crashes/oops/bugs,
or an initcall_debug log.

Give each of these init and exit functions unique driver-specific
names to eliminate the anonymous names.

Example 1: (System.map)
ffffffff832fc78c t init
ffffffff832fc79e t init
ffffffff832fc8f8 t init

Example 2: (initcall_debug log)
calling init+0x0/0x12 @ 1
initcall init+0x0/0x12 returned 0 after 15 usecs
calling init+0x0/0x60 @ 1
initcall init+0x0/0x60 returned 0 after 2 usecs
calling init+0x0/0x9a @ 1
initcall init+0x0/0x9a returned 0 after 74 usecs

Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Randy Dunlap and committed by
Pablo Neira Ayuso
fd421392 e86dbdb9

+4 -4
+4 -4
net/ipv4/netfilter/nf_nat_h323.c
··· 580 580 }; 581 581 582 582 /****************************************************************************/ 583 - static int __init init(void) 583 + static int __init nf_nat_h323_init(void) 584 584 { 585 585 BUG_ON(set_h245_addr_hook != NULL); 586 586 BUG_ON(set_h225_addr_hook != NULL); ··· 607 607 } 608 608 609 609 /****************************************************************************/ 610 - static void __exit fini(void) 610 + static void __exit nf_nat_h323_fini(void) 611 611 { 612 612 RCU_INIT_POINTER(set_h245_addr_hook, NULL); 613 613 RCU_INIT_POINTER(set_h225_addr_hook, NULL); ··· 624 624 } 625 625 626 626 /****************************************************************************/ 627 - module_init(init); 628 - module_exit(fini); 627 + module_init(nf_nat_h323_init); 628 + module_exit(nf_nat_h323_fini); 629 629 630 630 MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@users.sourceforge.net>"); 631 631 MODULE_DESCRIPTION("H.323 NAT helper");