From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 7/7] netfilter: NETFILTER_XT_TARGET_LOG selects NF_LOG_*
Date: Tue, 2 Sep 2014 12:14:04 +0200 [thread overview]
Message-ID: <1409652844-10289-8-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1409652844-10289-1-git-send-email-pablo@netfilter.org>
CONFIG_NETFILTER_XT_TARGET_LOG is not selected anymore when jumping
from 3.16 to 3.17-rc1 if you don't set on the new NF_LOG_IPV4 and
NF_LOG_IPV6 switches.
Change this to select the three new symbols NF_LOG_COMMON, NF_LOG_IPV4
and NF_LOG_IPV6 instead, so NETFILTER_XT_TARGET_LOG remains enabled
when moving from old to new kernels.
Reported-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/Kconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 05eb177..4bef6eb 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -747,7 +747,9 @@ config NETFILTER_XT_TARGET_LED
config NETFILTER_XT_TARGET_LOG
tristate "LOG target support"
- depends on NF_LOG_IPV4 && NF_LOG_IPV6
+ select NF_LOG_COMMON
+ select NF_LOG_IPV4
+ select NF_LOG_IPV6 if IPV6
default m if NETFILTER_ADVANCED=n
help
This option adds a `LOG' target, which allows you to create rules in
--
1.7.10.4
next prev parent reply other threads:[~2014-09-02 10:14 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-02 10:13 [PATCH 0/7] pull request: Netfilter/IPVS fixes for net Pablo Neira Ayuso
2014-09-02 10:13 ` [PATCH 1/7] netfilter: move NAT Kconfig switches out of the iptables scope Pablo Neira Ayuso
2014-09-02 10:13 ` [PATCH 2/7] netfilter: x_tables: allow to use default cgroup match Pablo Neira Ayuso
2014-09-02 10:14 ` [PATCH 3/7] netfilter: nf_tables: nat expression must select CONFIG_NF_NAT Pablo Neira Ayuso
2014-09-02 10:14 ` [PATCH 4/7] netfilter: HAVE_JUMP_LABEL instead of CONFIG_JUMP_LABEL Pablo Neira Ayuso
2014-09-02 10:14 ` [PATCH 5/7] ipvs: properly declare tunnel encapsulation Pablo Neira Ayuso
2014-09-02 10:14 ` [PATCH 6/7] ipvs: fix ipv6 hook registration for local replies Pablo Neira Ayuso
2014-09-02 10:14 ` Pablo Neira Ayuso [this message]
2014-09-02 20:57 ` [PATCH 0/7] pull request: Netfilter/IPVS fixes for net David Miller
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=1409652844-10289-8-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).