[Devel] [PATCH RHEL7 COMMIT] ms/netfilter: ipt_CLUSTERIP: create proc entry under proper ipt_CLUSTERIP directory

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.22
------>
commit 90a6058501a752eb80101eaa126fcc443b809cb5
Author: Gao feng <gaofeng at cn.fujitsu.com>
Date:   Mon Jun 29 17:59:46 2015 +0400

    ms/netfilter: ipt_CLUSTERIP: create proc entry under proper ipt_CLUSTERIP directory
    
    Create proc entries under the ipt_CLUSTERIP directory of proper
    net namespace.
    
    Signed-off-by: Gao feng <gaofeng at cn.fujitsu.com>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
    (cherry picked from commit f58d7866018dedae7ec67e152402b8ede17ce39e)
    Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
---
 net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 8945df5..78b7767 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -168,7 +168,7 @@ clusterip_config_init(const struct ipt_clusterip_tgt_info *i, __be32 ip,
 			struct net_device *dev)
 {
 	struct clusterip_config *c;
-	struct clusterip_net *cn = net_generic(&init_net, clusterip_net_id);
+	struct clusterip_net *cn = net_generic(dev_net(dev), clusterip_net_id);
 
 	c = kzalloc(sizeof(*c), GFP_ATOMIC);
 	if (!c)