diff options
| author | geoffroy.weisenhorn <weisenhorn.geoffroy@intel.com> | 2015-10-06 17:56:53 +0200 |
|---|---|---|
| committer | Mihai Serban <mihai.serban@intel.com> | 2016-01-07 17:55:08 +0200 |
| commit | d13eecc21891bb85b88f5aa963be2ac2df6ab414 (patch) | |
| tree | 20e5662b7bea432e079cd000434233d99599416e | |
| parent | 72d0b1f57b53ee5a3979819ac0fa31f4883cebde (diff) | |
| download | minnowboard-v3.14-d13eecc21891bb85b88f5aa963be2ac2df6ab414.tar.gz | |
Update netfilter configuration for M
Android Marshmallow add a new subcommand to ndc strict, this needs to
activate following netfilter extensions :Connmark, owner , u32
Change-Id: I21f6491367afb3a4dea56f1c4c343e314a2fe822
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-1043
Signed-off-by: geoffroy.weisenhorn <weisenhorn.geoffroy@intel.com>
| -rw-r--r-- | arch/x86/configs/x86_64_debug_defconfig | 4 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_defconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/configs/x86_64_debug_defconfig b/arch/x86/configs/x86_64_debug_defconfig index d76924741cf..50198702eb1 100644 --- a/arch/x86/configs/x86_64_debug_defconfig +++ b/arch/x86/configs/x86_64_debug_defconfig @@ -810,7 +810,7 @@ CONFIG_NETFILTER_XT_CONNMARK=y CONFIG_NETFILTER_XT_TARGET_AUDIT=m # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y # CONFIG_NETFILTER_XT_TARGET_CT is not set # CONFIG_NETFILTER_XT_TARGET_DSCP is not set @@ -865,7 +865,7 @@ CONFIG_NETFILTER_XT_MATCH_L2TP=y # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set # CONFIG_NETFILTER_XT_MATCH_OSF is not set -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=y CONFIG_NETFILTER_XT_MATCH_POLICY=y # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 310279cad5d..6ea007378a9 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig @@ -808,7 +808,7 @@ CONFIG_NETFILTER_XT_CONNMARK=y CONFIG_NETFILTER_XT_TARGET_AUDIT=m # CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set # CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y # CONFIG_NETFILTER_XT_TARGET_CT is not set # CONFIG_NETFILTER_XT_TARGET_DSCP is not set @@ -863,7 +863,7 @@ CONFIG_NETFILTER_XT_MATCH_L2TP=y # CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set # CONFIG_NETFILTER_XT_MATCH_NFACCT is not set # CONFIG_NETFILTER_XT_MATCH_OSF is not set -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +CONFIG_NETFILTER_XT_MATCH_OWNER=y CONFIG_NETFILTER_XT_MATCH_POLICY=y # CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set # CONFIG_NETFILTER_XT_MATCH_QUOTA is not set |