aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipvs/ip_vs_ftp.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_ftp.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_ftp.c')
-rw-r--r--net/netfilter/ipvs/ip_vs_ftp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c
index 1e589f8644ca..af3a9bbdf2ae 100644
--- a/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@ -260,9 +260,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,
buf_len = strlen(buf);
ct = nf_ct_get(skb, &ctinfo);
- if (ct && !nf_ct_is_untracked(ct) && (ct->status & IPS_NAT_MASK)) {
+ if (ct && nfct_nat(ct)) {
bool mangled;
-
/* If mangling fails this function will return 0
* which will cause the packet to be dropped.
* Mangling can only fail under memory pressure,