From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 20 Aug 2015 23:10:19 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master' of git://git./linux/kernel/git/davem/net-next

Resolve conflicts with conntrack template fixes.

Conflicts:
	net/netfilter/nf_conntrack_core.c
	net/netfilter/nf_synproxy_core.c
	net/netfilter/xt_CT.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

81bf1c64e7fe08f956c74fe2b0f1fa6eb163bd91
diff --cc net/netfilter/nf_synproxy_core.c
index 58b2e84dab27,14f8b43ec5a7..8fbbdb09826e
--- a/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@@ -354,11 -352,9 +354,9 @@@ static int __net_init synproxy_net_init
  	struct nf_conn *ct;
  	int err = -ENOMEM;
  
 -	ct = nf_ct_tmpl_alloc(net, 0, GFP_KERNEL);
 +	ct = nf_ct_tmpl_alloc(net, &nf_ct_zone_dflt, GFP_KERNEL);
- 	if (IS_ERR(ct)) {
- 		err = PTR_ERR(ct);
+ 	if (!ct)
  		goto err1;
- 	}
  
  	if (!nfct_seqadj_ext_add(ct))
  		goto err2;
diff --cc net/netfilter/xt_CT.c
index 346509825a80,43ddeee404e9..8e524898ccea
--- a/net/netfilter/xt_CT.c
+++ b/net/netfilter/xt_CT.c
@@@ -217,16 -201,11 +217,17 @@@ static int xt_ct_tg_check(const struct 
  	if (ret < 0)
  		goto err1;
  
 -	ct = nf_ct_tmpl_alloc(par->net, info->zone, GFP_KERNEL);
 +	memset(&zone, 0, sizeof(zone));
 +	zone.id = info->zone;
 +	zone.dir = xt_ct_flags_to_dir(info);
 +	if (info->flags & XT_CT_ZONE_MARK)
 +		zone.flags |= NF_CT_FLAG_MARK;
 +
 +	ct = nf_ct_tmpl_alloc(par->net, &zone, GFP_KERNEL);
- 	ret = PTR_ERR(ct);
- 	if (IS_ERR(ct))
+ 	if (!ct) {
+ 		ret = -ENOMEM;
  		goto err2;
+ 	}
  
  	ret = 0;
  	if ((info->ct_events || info->exp_events) &&