From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Sat, 15 Apr 2017 08:54:40 +0000 (+0200)
Subject: Merge tag 'ipvs2-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms... 
X-Git-Tag: v4.12-rc1~129^2~32^2~32
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a702ece3b186dcf3577c33747359be13352951b6;p=linux.git

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

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
---

a702ece3b186dcf3577c33747359be13352951b6
diff --cc net/netfilter/ipvs/ip_vs_ftp.c
index e9e721e63844,6caf4459e981..1e589f8644ca
--- a/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,