From: Manjunath Govindashetty <manjunath.govindashetty@oracle.com>
Date: Thu, 7 Jul 2016 21:05:57 +0000 (-0700)
Subject: Enable CONFIG_CONNTRACK_ZONES for Ol6
X-Git-Tag: v4.1.12-92~112^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e2d2ce23bada2438d3cb88e50f03ae477df2a3ef;p=users%2Fjedix%2Flinux-maple.git

Enable CONFIG_CONNTRACK_ZONES for Ol6

To support secure networking O3L 3.0.beta1 require
conntrack zones enabled on all platforms Ol6 and Ol7
irequired for Oracle OpenStack/Oracle Linux"(O3L)
3.0.beta1.

Orabug: 23755115
---

diff --git a/uek-rpm/ol6/config-x86_64 b/uek-rpm/ol6/config-x86_64
index a03ba0c17ea84..b4ccecbdf0cd3 100644
--- a/uek-rpm/ol6/config-x86_64
+++ b/uek-rpm/ol6/config-x86_64
@@ -931,7 +931,7 @@ CONFIG_NF_CONNTRACK=m
 CONFIG_NF_LOG_COMMON=m
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
-# CONFIG_NF_CONNTRACK_ZONES is not set
+CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_PROCFS=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 # CONFIG_NF_CONNTRACK_TIMEOUT is not set