From: pablo@netfilter.org
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 4/4] netfilter: nf_ct_h323: fix usage of MODULE_ALIAS_NFCT_HELPER
Date: Mon, 14 May 2012 13:47:03 +0200 [thread overview]
Message-ID: <1336996023-20249-5-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1336996023-20249-1-git-send-email-pablo@netfilter.org>
From: Pablo Neira Ayuso <pablo@netfilter.org>
ctnetlink uses the aliases that are created by MODULE_ALIAS_NFCT_HELPER
to auto-load the module based on the helper name. Thus, we have to use
RAS, Q.931 and H.245, not H.323.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/nf_conntrack_h323_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 722291f..b7bf187 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -1833,4 +1833,6 @@ MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@users.sourceforge.net>");
MODULE_DESCRIPTION("H.323 connection tracking helper");
MODULE_LICENSE("GPL");
MODULE_ALIAS("ip_conntrack_h323");
-MODULE_ALIAS_NFCT_HELPER("h323");
+MODULE_ALIAS_NFCT_HELPER("RAS");
+MODULE_ALIAS_NFCT_HELPER("Q.931");
+MODULE_ALIAS_NFCT_HELPER("H.245");
--
1.7.10
next prev parent reply other threads:[~2012-05-14 11:47 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-14 11:46 [PATCH 0/4] netfilter fixes for 3.4-rc7 pablo
2012-05-14 11:47 ` [PATCH 1/4] netfilter: ipset: fix timeout value overflow bug pablo
2012-05-14 14:19 ` David Laight
2012-05-14 14:36 ` Pablo Neira Ayuso
2012-05-14 14:47 ` Eric Dumazet
2012-05-14 17:45 ` Jozsef Kadlecsik
2012-05-14 19:00 ` Pablo Neira Ayuso
2012-05-14 20:10 ` Pablo Neira Ayuso
2012-05-14 21:45 ` Jozsef Kadlecsik
2012-05-15 8:21 ` David Laight
2012-05-14 11:47 ` [PATCH 2/4] netfilter: ipset: fix hash size checking in kernel pablo
2012-05-14 11:47 ` [PATCH 3/4] netfilter: xt_CT: remove redundant header include pablo
2012-05-14 11:47 ` pablo [this message]
2012-05-14 22:56 ` [PATCH 0/4] netfilter fixes for 3.4-rc7 David Miller
2012-05-14 23:25 ` Pablo Neira Ayuso
2012-05-16 18:41 ` Jozsef Kadlecsik
2012-05-16 19:18 ` David Miller
2012-05-16 19:34 ` Jozsef Kadlecsik
2012-05-16 19:39 ` David Miller
2012-05-16 19:48 ` Jozsef Kadlecsik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336996023-20249-5-git-send-email-pablo@netfilter.org \
--to=pablo@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).