[Devel] [PATCH RHEL7 COMMIT] ve/netfilter: put appropriate part under CONFIG_VE_IPTABLES

[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.4.10
------>
commit 07f71c74fccb4900b5c2594dc00a9b550499f589
Author: Kir Kolyshkin <kir at openvz.org>
Date:   Thu May 7 20:28:14 2015 +0400

    ve/netfilter: put appropriate part under CONFIG_VE_IPTABLES
    
    This was found while tring to compile the kernel with a stock
    config (i.e. no CONFIG_BEANCOUNTERS, CONFIG_VE etc.) and
    boot it on IBM Power8.
    
    =============================================================
    
    Fix compilation with !CONFIG_VE_IPTABLES.
    
      CC [M]  net/netfilter/nf_conntrack_standalone.o
    net/netfilter/nf_conntrack_standalone.c: In function ‘nf_conntrack_standalone_init’:
    net/netfilter/nf_conntrack_standalone.c:587:12: error: ‘struct ve_struct’ has no member named ‘ipt_mask’
       get_ve0()->ipt_mask &= ~(VE_NF_CONNTRACK_MOD | VE_IP_IPTABLE_NAT_MOD);
                ^
    net/netfilter/nf_conntrack_standalone.c:590:12: error: ‘struct ve_struct’ has no member named ‘ipt_mask’
       get_ve0()->ipt_mask |= VE_NF_CONNTRACK_MOD | VE_IP_IPTABLE_NAT_MOD;
                ^
    
    Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 net/netfilter/nf_conntrack_standalone.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 6e45fc2..ee2889d 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -582,6 +582,7 @@ static int __init nf_conntrack_standalone_init(void)
 {
 	int ret;
 
+#ifdef CONFIG_VE_IPTABLES
 	if (ip_conntrack_disable_ve0) {
 		printk("Disabling conntracks and NAT for ve0\n");
 		get_ve0()->ipt_mask &= ~(VE_NF_CONNTRACK_MOD | VE_IP_IPTABLE_NAT_MOD);
@@ -589,6 +590,7 @@ static int __init nf_conntrack_standalone_init(void)
 		printk("Enabling conntracks and NAT for ve0\n");
 		get_ve0()->ipt_mask |= VE_NF_CONNTRACK_MOD | VE_IP_IPTABLE_NAT_MOD;
 	}
+#endif
 
 	ret = nf_conntrack_init_start();
 	if (ret < 0)