Commit 24b7811f authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso

netfilter: xt_TEE: get rid of WITH_CONNTRACK definition

Use IS_ENABLED(CONFIG_NF_CONNTRACK) instead.
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 0c45e769
...@@ -24,10 +24,8 @@ ...@@ -24,10 +24,8 @@
#include <net/route.h> #include <net/route.h>
#include <linux/netfilter/x_tables.h> #include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_TEE.h> #include <linux/netfilter/xt_TEE.h>
#if IS_ENABLED(CONFIG_NF_CONNTRACK) #if IS_ENABLED(CONFIG_NF_CONNTRACK)
# define WITH_CONNTRACK 1 #include <net/netfilter/nf_conntrack.h>
# include <net/netfilter/nf_conntrack.h>
#endif #endif
struct xt_tee_priv { struct xt_tee_priv {
...@@ -99,7 +97,7 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par) ...@@ -99,7 +97,7 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
if (skb == NULL) if (skb == NULL)
return XT_CONTINUE; return XT_CONTINUE;
#ifdef WITH_CONNTRACK #if IS_ENABLED(CONFIG_NF_CONNTRACK)
/* Avoid counting cloned packets towards the original connection. */ /* Avoid counting cloned packets towards the original connection. */
nf_conntrack_put(skb->nfct); nf_conntrack_put(skb->nfct);
skb->nfct = &nf_ct_untracked_get()->ct_general; skb->nfct = &nf_ct_untracked_get()->ct_general;
...@@ -175,7 +173,7 @@ tee_tg6(struct sk_buff *skb, const struct xt_action_param *par) ...@@ -175,7 +173,7 @@ tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
if (skb == NULL) if (skb == NULL)
return XT_CONTINUE; return XT_CONTINUE;
#ifdef WITH_CONNTRACK #if IS_ENABLED(CONFIG_NF_CONNTRACK)
nf_conntrack_put(skb->nfct); nf_conntrack_put(skb->nfct);
skb->nfct = &nf_ct_untracked_get()->ct_general; skb->nfct = &nf_ct_untracked_get()->ct_general;
skb->nfctinfo = IP_CT_NEW; skb->nfctinfo = IP_CT_NEW;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment