diff options
| author | Sooyoung Ha <yoosah.ha@samsung.com> | 2016-06-20 11:52:18 +0900 |
|---|---|---|
| committer | Sooyoung Ha <yoosah.ha@samsung.com> | 2016-06-20 11:52:42 +0900 |
| commit | b8e7a76bab20eb88a1c81156cc99c14e241df130 (patch) | |
| tree | 349a8cb95fd78d24131be77e0cafd0b87bc99274 | |
| parent | c355b4f83b35796c6fcf0ebfec2ccdb3ed41ac7a (diff) | |
| download | emulator-kernel-b8e7a76bab20eb88a1c81156cc99c14e241df130.tar.gz emulator-kernel-b8e7a76bab20eb88a1c81156cc99c14e241df130.tar.bz2 emulator-kernel-b8e7a76bab20eb88a1c81156cc99c14e241df130.zip | |
Revert "Enable CONFIG_NETFILTER_XT_MARK, CONFIG_NETFILTER_XT_TARGET_AUDIT,"
This reverts commit 32679e5989e5ada559367fd839c58ead737b1cfb.
Change-Id: Id23efadf11ee72ffba98acd624d218a32deb0116
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
| -rw-r--r-- | arch/x86/configs/tizen_emul_defconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/configs/tizen_emul_defconfig b/arch/x86/configs/tizen_emul_defconfig index 61ed1edcf454..3ac256565f13 100644 --- a/arch/x86/configs/tizen_emul_defconfig +++ b/arch/x86/configs/tizen_emul_defconfig @@ -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 |