Revert "Enable CONFIG_NETFILTER_XT_MARK, CONFIG_NETFILTER_XT_TARGET_AUDIT,"
authorSooyoung Ha <yoosah.ha@samsung.com>
Mon, 20 Jun 2016 02:52:18 +0000 (11:52 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Mon, 20 Jun 2016 02:52:42 +0000 (11:52 +0900)
This reverts commit 32679e5989e5ada559367fd839c58ead737b1cfb.

Change-Id: Id23efadf11ee72ffba98acd624d218a32deb0116
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
arch/x86/configs/tizen_emul_defconfig

index 61ed1edcf4540f41e43948e6ba4137f1be1ff83f..3ac256565f1307367696d9e84225b09fb9828efb 100644 (file)
@@ -813,13 +813,13 @@ CONFIG_NETFILTER_XTABLES=y
 #
 # Xtables combined modules
 #
-CONFIG_NETFILTER_XT_MARK=y
+CONFIG_NETFILTER_XT_MARK=m
 # CONFIG_NETFILTER_XT_CONNMARK is not set
 
 #
 # Xtables targets
 #
-CONFIG_NETFILTER_XT_TARGET_AUDIT=y
+# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
 # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
 # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
 # CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
@@ -833,7 +833,7 @@ CONFIG_NETFILTER_XT_TARGET_LOG=m
 # CONFIG_NETFILTER_XT_TARGET_MARK is not set
 # CONFIG_NETFILTER_XT_TARGET_NETMAP is not set
 CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
 # CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
 # CONFIG_NETFILTER_XT_TARGET_REDIRECT is not set
 # CONFIG_NETFILTER_XT_TARGET_TEE is not set
@@ -3630,7 +3630,6 @@ CONFIG_SECURITY_NETWORK=y
 # CONFIG_SECURITY_PATH is not set
 # CONFIG_SECURITY_SELINUX is not set
 CONFIG_SECURITY_SMACK=y
-CONFIG_SECURITY_SMACK_NETFILTER=y
 CONFIG_SECURITY_SMACK_BRINGUP=y
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set