diff options
| author | Maciej Żenczykowski <maze@google.com> | 2019-03-05 23:01:40 -0800 |
|---|---|---|
| committer | Maciej Żenczykowski <maze@google.com> | 2019-03-05 23:01:40 -0800 |
| commit | ff99b0fc76a1647829f363e350a2ea8a174d3d98 (patch) | |
| tree | 155a97b5f97a070bb360ebcae3e7952d58b5501f | |
| parent | f5f87ecac1cfdcfd13d0870b9acdc39a7c1cb3c9 (diff) | |
ANDROID: cuttlefish: enable CONFIG_NETFILTER_XT_TARGET_CT=yASB-2019-03-05_4.9
This is to mirror:
https://android-review.googlesource.com/c/kernel/configs/+/919855
android-4.9+: add CONFIG_NETFILTER_XT_TARGET_CT=y to base config
Generated via:
echo 'CONFIG_NETFILTER_XT_TARGET_CT=y' >> arch/x86/configs/x86_64_cuttlefish_defconfig
echo 'CONFIG_NETFILTER_XT_TARGET_CT=y' >> arch/arm64/configs/cuttlefish_defconfig
make ARCH=x86_64 x86_64_cuttlefish_defconfig
make ARCH=x86_64 savedefconfig
cat defconfig > arch/x86/configs/x86_64_cuttlefish_defconfig
make ARCH=arm64 cuttlefish_defconfig
make ARCH=arm64 savedefconfig
cat defconfig > arch/arm64/configs/cuttlefish_defconfig
rm defconfig
Bug: 124361845
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6035ef8e75f9daada706a9233999368a22904c4e
| -rw-r--r-- | arch/arm64/configs/cuttlefish_defconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_cuttlefish_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 8afaa5251aad..a6691212106d 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -123,6 +123,7 @@ CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y CONFIG_NETFILTER_XT_TARGET_CONNMARK=y CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_CT=y CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y CONFIG_NETFILTER_XT_TARGET_MARK=y CONFIG_NETFILTER_XT_TARGET_NFLOG=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index a22ed6a4378d..053b795a732e 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -134,6 +134,7 @@ CONFIG_NF_CT_NETLINK=y CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y CONFIG_NETFILTER_XT_TARGET_CONNMARK=y CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y +CONFIG_NETFILTER_XT_TARGET_CT=y CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y CONFIG_NETFILTER_XT_TARGET_MARK=y CONFIG_NETFILTER_XT_TARGET_NFLOG=y |