[Devel] [PATCH RHEL7 COMMIT] ve/net/iptables: Add ipv6 bits into VE_IP_DEFAULT

[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.12
------>
commit 8bd6c3e703515b86677c16238383ba16a5fd0c49
Author: Kirill Tkhai <ktkhai at odin.com>
Date:   Wed Jun 10 18:47:11 2015 +0400

    ve/net/iptables: Add ipv6 bits into VE_IP_DEFAULT
    
    @khorenko:
    We never differed ipv4 and ipv6 in the iptables mask =>
    let's put the ipv6 bits into kernel default mask.
    
    Signed-off-by: Kirill Tkhai <ktkhai at odin.com>
---
 include/uapi/linux/vziptable_defs.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/uapi/linux/vziptable_defs.h b/include/uapi/linux/vziptable_defs.h
index 4ac920a..2b304a3 100644
--- a/include/uapi/linux/vziptable_defs.h
+++ b/include/uapi/linux/vziptable_defs.h
@@ -63,7 +63,8 @@ enum ve_ipt_mods {
 #define VE_IP_IPTABLE_NAT	(VE_IP_IPTABLE_NAT_MOD | VE_IP_CONNTRACK)
 
 /* safe iptables mask to be used by default */
-#define VE_IP_DEFAULT		(VE_IP_IPTABLES | VE_IP_FILTER | VE_IP_MANGLE)
+#define VE_IP_DEFAULT		(VE_IP_IPTABLES | VE_IP_FILTER | VE_IP_MANGLE | \
+				 VE_IP_IPTABLES6 | VE_IP_FILTER6 | VE_IP_MANGLE6)
 
 #define VE_IP_NONE		(0ull)
 #define VE_IP_ALL		(~VE_IP_NONE)