diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2015-07-01 16:38:10 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-07 11:49:48 +0200 |
| commit | 24b7811fa5de7bbbab3b782a38889034ea267f70 (patch) | |
| tree | eb4af9c211e947ed4f84cf7f2aad4fa06788b0f7 /net/netfilter | |
| parent | netfilter: nft_counter: convert it to use per-cpu counters (diff) | |
| download | linux-dev-24b7811fa5de7bbbab3b782a38889034ea267f70.tar.xz linux-dev-24b7811fa5de7bbbab3b782a38889034ea267f70.zip | |
netfilter: xt_TEE: get rid of WITH_CONNTRACK definition
Use IS_ENABLED(CONFIG_NF_CONNTRACK) instead.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/xt_TEE.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/netfilter/xt_TEE.c b/net/netfilter/xt_TEE.c index c5d6556dbc5e..0ed9fb61d470 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; |