From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: phil@nwl.cc, Florian Westphal <fw@strlen.de>
Subject: [PATCH 7/8] netfilter: nf_log: add module softdeps
Date: Thu, 25 Mar 2021 18:25:11 +0100 [thread overview]
Message-ID: <20210325172512.17729-8-fw@strlen.de> (raw)
In-Reply-To: <20210325172512.17729-1-fw@strlen.de>
xt_LOG has no direct dependency on the syslog-based logger, it relies
on the nf_log core to probe the requested backend.
Now that all syslog-based loggers reside in the same module, we can
just add a soft dependency on nf_log_syslog and let modprobe take
care of it.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
net/netfilter/xt_LOG.c | 1 +
net/netfilter/xt_NFLOG.c | 1 +
net/netfilter/xt_TRACE.c | 1 +
3 files changed, 3 insertions(+)
diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c
index a1e79b517c01..2ff75f7637b0 100644
--- a/net/netfilter/xt_LOG.c
+++ b/net/netfilter/xt_LOG.c
@@ -108,3 +108,4 @@ MODULE_AUTHOR("Jan Rekorajski <baggins@pld.org.pl>");
MODULE_DESCRIPTION("Xtables: IPv4/IPv6 packet logging");
MODULE_ALIAS("ipt_LOG");
MODULE_ALIAS("ip6t_LOG");
+MODULE_SOFTDEP("pre: nf_log_syslog");
diff --git a/net/netfilter/xt_NFLOG.c b/net/netfilter/xt_NFLOG.c
index 6e83ce3000db..fb5793208059 100644
--- a/net/netfilter/xt_NFLOG.c
+++ b/net/netfilter/xt_NFLOG.c
@@ -79,3 +79,4 @@ static void __exit nflog_tg_exit(void)
module_init(nflog_tg_init);
module_exit(nflog_tg_exit);
+MODULE_SOFTDEP("pre: nfnetlink_log");
diff --git a/net/netfilter/xt_TRACE.c b/net/netfilter/xt_TRACE.c
index 349ab5609b1b..5582dce98cae 100644
--- a/net/netfilter/xt_TRACE.c
+++ b/net/netfilter/xt_TRACE.c
@@ -52,3 +52,4 @@ static void __exit trace_tg_exit(void)
module_init(trace_tg_init);
module_exit(trace_tg_exit);
+MODULE_SOFTDEP("pre: nf_log_syslog");
--
2.26.3
next prev parent reply other threads:[~2021-03-25 17:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 17:25 [PATCH 0/8] netfilter: merge nf_log_proto modules Florian Westphal
2021-03-25 17:25 ` [PATCH 1/8] netfilter: nf_log_ipv4: rename to nf_log_syslog Florian Westphal
2021-03-25 17:25 ` [PATCH 2/8] netfilter: nf_log_arp: merge with nf_log_syslog Florian Westphal
2021-03-25 17:25 ` [PATCH 3/8] netfilter: nf_log_ipv6: " Florian Westphal
2021-03-25 17:25 ` [PATCH 4/8] netfilter: nf_log_netdev: " Florian Westphal
2021-03-25 17:25 ` [PATCH 5/8] netfilter: nf_log_bridge: " Florian Westphal
2021-03-25 17:25 ` [PATCH 6/8] netfilter: nf_log_common: " Florian Westphal
2021-03-25 17:25 ` Florian Westphal [this message]
2021-03-25 17:25 ` [PATCH 8/8] netfilter: nft_log: perform module load from nf_tables Florian Westphal
2021-03-26 14:35 ` [PATCH 0/8] netfilter: merge nf_log_proto modules Phil Sutter
2021-03-30 22:50 ` Pablo Neira Ayuso
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=20210325172512.17729-8-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
--cc=phil@nwl.cc \
/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).