add new kernel for OSCI-946

[packages/centos6/kernel.git] / config-generic-rhel

diff --git a/config-generic-rhel b/config-generic-rhel
index 5b77aff5f7f13cbe64a605448406aa41470733cc..bbe7080bb39af55781681232ec7e3efae50eba7f 100644 (file)
--- a/config-generic-rhel
+++ b/config-generic-rhel
@@ -101,7 +101,7 @@ CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
-CONFIG_NET_IPGRE_DEMUX=y
+CONFIG_NET_IPGRE_DEMUX=m
 CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_NETFILTER_XT_TARGET_AUDIT=m
@@ -121,8 +121,7 @@ CONFIG_IP_SET_LIST_SET=m
 CONFIG_NETFILTER_XT_SET=m
 CONFIG_NET_SCH_MQPRIO=m
 CONFIG_NET_SCH_QFQ=m
-CONFIG_OPENVSWITCH=m
-CONFIG_OPENVSWITCH_GRE=y
+# CONFIG_OPENVSWITCH is not set
 CONFIG_VXLAN=m
 CONFIG_NETPRIO_CGROUP=y
 CONFIG_MODULE_SIG=y