From cfe83da8bd9b75ac692fb9fb10eb0c854311c455 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 21 Sep 2022 15:36:15 +0200 Subject: [PATCH] Revert "netfilter: conntrack: NF_CONNTRACK_PROCFS should no longer default to y" This reverts commit 63c7905840310a42a5d01b3c968b4dc9a157437a which is commit aa5762c34213aba7a72dc58e70601370805fa794 upstream. It changes the default configuration options, which breaks the Android kernel abi, which is not a good thing at the moment. So revert this for now as it's not needed for this Android branch. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman Change-Id: Ia6bcc02c5f1e3e527f69f859a7e0deccc9d546dd --- net/netfilter/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 91d25b6b1215..2ab05991abee 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -118,6 +118,7 @@ config NF_CONNTRACK_ZONES config NF_CONNTRACK_PROCFS bool "Supply CT list in procfs (OBSOLETE)" + default y depends on PROC_FS ---help--- This option enables for the list of known conntrack entries