Merge tag 'ipvs2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms...

Simon Horman says:

====================
Second Round of IPVS Updates for v4.12

please consider these clean-ups and enhancements to IPVS for v4.12.

* Removal unused variable
* Use kzalloc where appropriate
* More efficient detection of presence of NAT extension
====================

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Conflicts:
	net/netfilter/ipvs/ip_vs_ftp.c

diff --cc net/netfilter/ipvs/ip_vs_ftp.c
index e9e721e63844cbcdaad7caa36ded8ee4d10f64f3,6caf4459e981165cca3686b3ee426732e75fb6bc..1e589f8644ca85d733867f7373eafa9126b0bd72
--- 1/net/netfilter/ipvs/ip_vs_ftp.c
--- 2/net/netfilter/ipvs/ip_vs_ftp.c
+++ b/net/netfilter/ipvs/ip_vs_ftp.c
@@@ -260,9 -260,7 +260,9 @@@ static int ip_vs_ftp_out(struct ip_vs_a
                buf_len = strlen(buf);
  
                ct = nf_ct_get(skb, &ctinfo);
-               if (ct && !nf_ct_is_untracked(ct) && nfct_nat(ct)) {
+               if (ct && !nf_ct_is_untracked(ct) && (ct->status & IPS_NAT_MASK)) {
 +                      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,