From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AF91C433F5 for ; Thu, 17 Mar 2022 20:42:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229923AbiCQUoD (ORCPT ); Thu, 17 Mar 2022 16:44:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229879AbiCQUn7 (ORCPT ); Thu, 17 Mar 2022 16:43:59 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1779A133690; Thu, 17 Mar 2022 13:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description; bh=3Vg3YWtqMNGIO5AWtFE29onUKdIZ8x188s7SviF5pPg=; b=tiAHL3PCQ2t7+lPOxKztKxihGl vd4Y8NiotnXISBxPTEpDpjnfGwN/+2gCzocwX9f1n0YfUlqtTEW8abkTbOXNks1/pe9V0o1aeVqiU mg+cp1CpvBpg/qj5G5LZWflb4aiFP803B14dktG2eQTzUpOmEwNqtoyK5FiuDb0e8dEHA1UwaTcNb TjTsqtIXdQy5uDTkofF/krC+Z1b0PK1+/Sh9yQPukGAwmINpZ+kCjgEBdHe1EVJZaGIr2Nw3tHUkm Ajhuyth6TCxfsRDyg2dioL17ZEbHaHLKorjuGU+sNiNOS0MkF5l5E/OHgiJGeyQY6IVrPFktt2Xla WvlJyMgw==; Received: from [2601:1c0:6280:3f0::aa0b] by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUwxB-007IuO-IC; Thu, 17 Mar 2022 20:42:37 +0000 Message-ID: <15fdafd4-e753-2c0e-4e61-6b168e064e72@infradead.org> Date: Thu, 17 Mar 2022 13:42:23 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit Content-Language: en-US To: Pablo Neira Ayuso Cc: linux-kernel@vger.kernel.org, "Michael S. Tsirkin" , Jason Wang , Paolo Bonzini , Stefan Hajnoczi , Jens Axboe , Amit Shah , Arnd Bergmann , Greg Kroah-Hartman , Eli Cohen , Saeed Mahameed , Leon Romanovsky , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Jakub Kicinski , "James E.J. Bottomley" , "Martin K. Petersen" , Felipe Balbi , =?UTF-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Sebastian Andrzej Siewior , Krzysztof Opasiak , Igor Kotrasinski , Valentina Manea , Shuah Khan , Shuah Khan , Jussi Kivilinna , Joachim Fritschi , Herbert Xu , Thomas Gleixner , Steven Rostedt , Ingo Molnar , Karol Herbst , Pekka Paalanen , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Borislav Petkov , "H. Peter Anvin" , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-block@vger.kernel.org, linux-crypto@vger.kernel.org, linux-rdma@vger.kernel.org, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, nouveau@lists.freedesktop.org, virtualization@lists.linux-foundation.org, x86@kernel.org References: <20220316192010.19001-1-rdunlap@infradead.org> <20220316192010.19001-5-rdunlap@infradead.org> From: Randy Dunlap In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org On 3/17/22 08:49, Pablo Neira Ayuso wrote: > On Wed, Mar 16, 2022 at 12:20:05PM -0700, Randy Dunlap wrote: >> 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 > > LGTM. > > Should I route this through the netfilter tree? Yes, please. Thanks. > >> Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") >> Signed-off-by: Randy Dunlap >> Cc: Pablo Neira Ayuso >> Cc: Jozsef Kadlecsik >> Cc: Florian Westphal >> Cc: netfilter-devel@vger.kernel.org >> Cc: coreteam@netfilter.org >> Cc: "David S. Miller" >> Cc: Jakub Kicinski >> Cc: netdev@vger.kernel.org >> --- >> net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> --- lnx-517-rc8.orig/net/ipv4/netfilter/nf_nat_h323.c >> +++ lnx-517-rc8/net/ipv4/netfilter/nf_nat_h323.c >> @@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn call >> }; >> >> /****************************************************************************/ >> -static int __init init(void) >> +static int __init nf_nat_h323_init(void) >> { >> BUG_ON(set_h245_addr_hook != NULL); >> BUG_ON(set_h225_addr_hook != NULL); >> @@ -607,7 +607,7 @@ static int __init init(void) >> } >> >> /****************************************************************************/ >> -static void __exit fini(void) >> +static void __exit nf_nat_h323_fini(void) >> { >> RCU_INIT_POINTER(set_h245_addr_hook, NULL); >> RCU_INIT_POINTER(set_h225_addr_hook, NULL); >> @@ -624,8 +624,8 @@ static void __exit fini(void) >> } >> >> /****************************************************************************/ >> -module_init(init); >> -module_exit(fini); >> +module_init(nf_nat_h323_init); >> +module_exit(nf_nat_h323_fini); >> >> MODULE_AUTHOR("Jing Min Zhao "); >> MODULE_DESCRIPTION("H.323 NAT helper"); -- ~Randy From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 006DCC433EF for ; Thu, 17 Mar 2022 20:43:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8F44A84817; Thu, 17 Mar 2022 20:43:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tPqbHaaL7ZJv; Thu, 17 Mar 2022 20:43:26 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp1.osuosl.org (Postfix) with ESMTPS id 37F0184815; Thu, 17 Mar 2022 20:43:26 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 0ECEBC0012; Thu, 17 Mar 2022 20:43:26 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id B45C9C000B for ; Thu, 17 Mar 2022 20:43:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A38E440319 for ; Thu, 17 Mar 2022 20:43:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp4.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=infradead.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j9pzsN__znTZ for ; Thu, 17 Mar 2022 20:43:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by smtp4.osuosl.org (Postfix) with ESMTPS id E607540308 for ; Thu, 17 Mar 2022 20:43:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description; bh=3Vg3YWtqMNGIO5AWtFE29onUKdIZ8x188s7SviF5pPg=; b=tiAHL3PCQ2t7+lPOxKztKxihGl vd4Y8NiotnXISBxPTEpDpjnfGwN/+2gCzocwX9f1n0YfUlqtTEW8abkTbOXNks1/pe9V0o1aeVqiU mg+cp1CpvBpg/qj5G5LZWflb4aiFP803B14dktG2eQTzUpOmEwNqtoyK5FiuDb0e8dEHA1UwaTcNb TjTsqtIXdQy5uDTkofF/krC+Z1b0PK1+/Sh9yQPukGAwmINpZ+kCjgEBdHe1EVJZaGIr2Nw3tHUkm Ajhuyth6TCxfsRDyg2dioL17ZEbHaHLKorjuGU+sNiNOS0MkF5l5E/OHgiJGeyQY6IVrPFktt2Xla WvlJyMgw==; Received: from [2601:1c0:6280:3f0::aa0b] by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUwxB-007IuO-IC; Thu, 17 Mar 2022 20:42:37 +0000 Message-ID: <15fdafd4-e753-2c0e-4e61-6b168e064e72@infradead.org> Date: Thu, 17 Mar 2022 13:42:23 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit Content-Language: en-US To: Pablo Neira Ayuso References: <20220316192010.19001-1-rdunlap@infradead.org> <20220316192010.19001-5-rdunlap@infradead.org> From: Randy Dunlap In-Reply-To: Cc: x86@kernel.org, Andy Lutomirski , "Michael S. Tsirkin" , Peter Zijlstra , nouveau@lists.freedesktop.org, Dave Hansen , Valentina Manea , Karol Herbst , Krzysztof Opasiak , Eli Cohen , netdev@vger.kernel.org, Shuah Khan , Thomas Gleixner , "H. Peter Anvin" , Arnd Bergmann , Leon Romanovsky , linux-rdma@vger.kernel.org, Ingo Molnar , Jozsef Kadlecsik , coreteam@netfilter.org, Jakub Kicinski , Sebastian Andrzej Siewior , Joachim Fritschi , Felipe Balbi , Amit Shah , "James E.J. Bottomley" , Steven Rostedt , =?UTF-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , linux-block@vger.kernel.org, Pekka Paalanen , Borislav Petkov , Stefan Hajnoczi , Shuah Khan , Jussi Kivilinna , virtualization@lists.linux-foundation.org, Herbert Xu , Jens Axboe , linux-scsi@vger.kernel.org, "Martin K. Petersen" , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Florian Westphal , linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, linux-crypto@vger.kernel.org, Igor Kotrasinski , Paolo Bonzini , Saeed Mahameed , "David S. Miller" X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" On 3/17/22 08:49, Pablo Neira Ayuso wrote: > On Wed, Mar 16, 2022 at 12:20:05PM -0700, Randy Dunlap wrote: >> 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 > > LGTM. > > Should I route this through the netfilter tree? Yes, please. Thanks. > >> Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") >> Signed-off-by: Randy Dunlap >> Cc: Pablo Neira Ayuso >> Cc: Jozsef Kadlecsik >> Cc: Florian Westphal >> Cc: netfilter-devel@vger.kernel.org >> Cc: coreteam@netfilter.org >> Cc: "David S. Miller" >> Cc: Jakub Kicinski >> Cc: netdev@vger.kernel.org >> --- >> net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> --- lnx-517-rc8.orig/net/ipv4/netfilter/nf_nat_h323.c >> +++ lnx-517-rc8/net/ipv4/netfilter/nf_nat_h323.c >> @@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn call >> }; >> >> /****************************************************************************/ >> -static int __init init(void) >> +static int __init nf_nat_h323_init(void) >> { >> BUG_ON(set_h245_addr_hook != NULL); >> BUG_ON(set_h225_addr_hook != NULL); >> @@ -607,7 +607,7 @@ static int __init init(void) >> } >> >> /****************************************************************************/ >> -static void __exit fini(void) >> +static void __exit nf_nat_h323_fini(void) >> { >> RCU_INIT_POINTER(set_h245_addr_hook, NULL); >> RCU_INIT_POINTER(set_h225_addr_hook, NULL); >> @@ -624,8 +624,8 @@ static void __exit fini(void) >> } >> >> /****************************************************************************/ >> -module_init(init); >> -module_exit(fini); >> +module_init(nf_nat_h323_init); >> +module_exit(nf_nat_h323_fini); >> >> MODULE_AUTHOR("Jing Min Zhao "); >> MODULE_DESCRIPTION("H.323 NAT helper"); -- ~Randy _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2EA48C433F5 for ; Sun, 27 Mar 2022 07:44:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 151CD10E037; Sun, 27 Mar 2022 07:44:04 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by gabe.freedesktop.org (Postfix) with ESMTPS id DA25910E103 for ; Thu, 17 Mar 2022 20:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description; bh=3Vg3YWtqMNGIO5AWtFE29onUKdIZ8x188s7SviF5pPg=; b=tiAHL3PCQ2t7+lPOxKztKxihGl vd4Y8NiotnXISBxPTEpDpjnfGwN/+2gCzocwX9f1n0YfUlqtTEW8abkTbOXNks1/pe9V0o1aeVqiU mg+cp1CpvBpg/qj5G5LZWflb4aiFP803B14dktG2eQTzUpOmEwNqtoyK5FiuDb0e8dEHA1UwaTcNb TjTsqtIXdQy5uDTkofF/krC+Z1b0PK1+/Sh9yQPukGAwmINpZ+kCjgEBdHe1EVJZaGIr2Nw3tHUkm Ajhuyth6TCxfsRDyg2dioL17ZEbHaHLKorjuGU+sNiNOS0MkF5l5E/OHgiJGeyQY6IVrPFktt2Xla WvlJyMgw==; Received: from [2601:1c0:6280:3f0::aa0b] by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1nUwxB-007IuO-IC; Thu, 17 Mar 2022 20:42:37 +0000 Message-ID: <15fdafd4-e753-2c0e-4e61-6b168e064e72@infradead.org> Date: Thu, 17 Mar 2022 13:42:23 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: Pablo Neira Ayuso References: <20220316192010.19001-1-rdunlap@infradead.org> <20220316192010.19001-5-rdunlap@infradead.org> From: Randy Dunlap In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Sun, 27 Mar 2022 07:44:03 +0000 Subject: Re: [Nouveau] [PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: x86@kernel.org, Andy Lutomirski , "Michael S. Tsirkin" , Peter Zijlstra , nouveau@lists.freedesktop.org, Jason Wang , Dave Hansen , Valentina Manea , Krzysztof Opasiak , Eli Cohen , netdev@vger.kernel.org, Shuah Khan , Thomas Gleixner , "H. Peter Anvin" , Arnd Bergmann , Leon Romanovsky , linux-rdma@vger.kernel.org, Ingo Molnar , Jozsef Kadlecsik , coreteam@netfilter.org, Jakub Kicinski , Sebastian Andrzej Siewior , Joachim Fritschi , Felipe Balbi , Amit Shah , "James E.J. Bottomley" , Steven Rostedt , =?UTF-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , linux-block@vger.kernel.org, Pekka Paalanen , Borislav Petkov , Stefan Hajnoczi , Shuah Khan , Jussi Kivilinna , virtualization@lists.linux-foundation.org, Herbert Xu , Jens Axboe , linux-scsi@vger.kernel.org, "Martin K. Petersen" , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Florian Westphal , linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, linux-crypto@vger.kernel.org, Igor Kotrasinski , Paolo Bonzini , Saeed Mahameed , "David S. Miller" Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" On 3/17/22 08:49, Pablo Neira Ayuso wrote: > On Wed, Mar 16, 2022 at 12:20:05PM -0700, Randy Dunlap wrote: >> 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 > > LGTM. > > Should I route this through the netfilter tree? Yes, please. Thanks. > >> Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") >> Signed-off-by: Randy Dunlap >> Cc: Pablo Neira Ayuso >> Cc: Jozsef Kadlecsik >> Cc: Florian Westphal >> Cc: netfilter-devel@vger.kernel.org >> Cc: coreteam@netfilter.org >> Cc: "David S. Miller" >> Cc: Jakub Kicinski >> Cc: netdev@vger.kernel.org >> --- >> net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> --- lnx-517-rc8.orig/net/ipv4/netfilter/nf_nat_h323.c >> +++ lnx-517-rc8/net/ipv4/netfilter/nf_nat_h323.c >> @@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn call >> }; >> >> /****************************************************************************/ >> -static int __init init(void) >> +static int __init nf_nat_h323_init(void) >> { >> BUG_ON(set_h245_addr_hook != NULL); >> BUG_ON(set_h225_addr_hook != NULL); >> @@ -607,7 +607,7 @@ static int __init init(void) >> } >> >> /****************************************************************************/ >> -static void __exit fini(void) >> +static void __exit nf_nat_h323_fini(void) >> { >> RCU_INIT_POINTER(set_h245_addr_hook, NULL); >> RCU_INIT_POINTER(set_h225_addr_hook, NULL); >> @@ -624,8 +624,8 @@ static void __exit fini(void) >> } >> >> /****************************************************************************/ >> -module_init(init); >> -module_exit(fini); >> +module_init(nf_nat_h323_init); >> +module_exit(nf_nat_h323_fini); >> >> MODULE_AUTHOR("Jing Min Zhao "); >> MODULE_DESCRIPTION("H.323 NAT helper"); -- ~Randy