aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipvs/ip_vs_nfct.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2017-04-14 20:31:09 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2017-04-15 11:51:33 +0200
commitab8bc7ed864b9c4f1fcb00a22bbe4e0f66ce8003 (patch)
tree552aa1ba20c173b0659e391b92554ce7b1edbe4e /net/netfilter/ipvs/ip_vs_nfct.c
parentnetfilter: kill the fake untracked conntrack objects (diff)
downloadlinux-dev-ab8bc7ed864b9c4f1fcb00a22bbe4e0f66ce8003.tar.xz
linux-dev-ab8bc7ed864b9c4f1fcb00a22bbe4e0f66ce8003.zip
netfilter: remove nf_ct_is_untracked
This function is now obsolete and always returns false. This change has no effect on generated code. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_nfct.c')
-rw-r--r--net/netfilter/ipvs/ip_vs_nfct.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_nfct.c b/net/netfilter/ipvs/ip_vs_nfct.c
index fc230d99aa3b..6cf3fd81a5ec 100644
--- a/net/netfilter/ipvs/ip_vs_nfct.c
+++ b/net/netfilter/ipvs/ip_vs_nfct.c
@@ -85,7 +85,7 @@ ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, int outin)
struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
struct nf_conntrack_tuple new_tuple;
- if (ct == NULL || nf_ct_is_confirmed(ct) || nf_ct_is_untracked(ct) ||
+ if (ct == NULL || nf_ct_is_confirmed(ct) ||
nf_ct_is_dying(ct))
return;
@@ -232,7 +232,7 @@ void ip_vs_nfct_expect_related(struct sk_buff *skb, struct nf_conn *ct,
{
struct nf_conntrack_expect *exp;
- if (ct == NULL || nf_ct_is_untracked(ct))
+ if (ct == NULL)
return;
exp = nf_ct_expect_alloc(ct);