From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 02/15] netfilter: xt_TEE: get rid of WITH_CONNTRACK definition
Date: Fri, 21 Aug 2015 06:32:31 +0200 [thread overview]
Message-ID: <1440131564-8807-3-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1440131564-8807-1-git-send-email-pablo@netfilter.org>
Use IS_ENABLED(CONFIG_NF_CONNTRACK) instead.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
net/netfilter/xt_TEE.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c
index c5d6556..0ed9fb6 100644
--- a/net/netfilter/xt_TEE.c
+++ b/net/netfilter/xt_TEE.c
@@ -24,10 +24,8 @@
#include <net/route.h>
#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_TEE.h>
-
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
-# define WITH_CONNTRACK 1
-# include <net/netfilter/nf_conntrack.h>
+#include <net/netfilter/nf_conntrack.h>
#endif
struct xt_tee_priv {
@@ -99,7 +97,7 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
if (skb == NULL)
return XT_CONTINUE;
-#ifdef WITH_CONNTRACK
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
/* Avoid counting cloned packets towards the original connection. */
nf_conntrack_put(skb->nfct);
skb->nfct = &nf_ct_untracked_get()->ct_general;
@@ -175,7 +173,7 @@ tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
if (skb == NULL)
return XT_CONTINUE;
-#ifdef WITH_CONNTRACK
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
nf_conntrack_put(skb->nfct);
skb->nfct = &nf_ct_untracked_get()->ct_general;
skb->nfctinfo = IP_CT_NEW;
--
1.7.10.4
next prev parent reply other threads:[~2015-08-21 4:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-21 4:32 [PATCH 00/15] Netfilter updates for net-next Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 01/15] netfilter: nft_counter: convert it to use per-cpu counters Pablo Neira Ayuso
2015-08-21 4:32 ` Pablo Neira Ayuso [this message]
2015-08-21 4:32 ` =?y?q?=5BPATCH=2003/15=5D=20netfilter=3A=20factor=20out=20packet=20duplication=20for=20IPv4/IPv6?= Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 04/15] netfilter: nf_tables: add nft_dup expression Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 05/15] netfilter: nft_limit: rename to nft_limit_pkts Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 06/15] netfilter: nft_limit: convert to token-based limiting at nanosecond granularity Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 07/15] netfilter: nft_limit: factor out shared code with per-byte limiting Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 08/15] netfilter: nft_limit: add burst parameter Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 09/15] netfilter: nft_limit: constant token cost per packet Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 10/15] netfilter: nft_limit: add per-byte limiting Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 11/15] netfilter: nfacct: per network namespace support Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 12/15] netfilter: nf_conntrack: push zone object into functions Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 13/15] netfilter: nf_conntrack: add direction support for zones Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 14/15] netfilter: nf_conntrack: add efficient mark to zone mapping Pablo Neira Ayuso
2015-08-21 4:32 ` [PATCH 15/15] netfilter: nft_payload: work around vlan header stripping Pablo Neira Ayuso
2015-08-21 5:19 ` [PATCH 00/15] Netfilter updates for net-next David Miller
-- strict thread matches above, loose matches on Subject: below --
2015-08-19 19:18 Pablo Neira Ayuso
2015-08-19 19:18 ` [PATCH 02/15] netfilter: xt_TEE: get rid of WITH_CONNTRACK definition 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=1440131564-8807-3-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).