Merge tag 'net-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[people/ms/linux.git] / Documentation / networking / nf_conntrack-sysctl.rst

diff --git a/Documentation/networking/nf_conntrack-sysctl.rst b/Documentation/networking/nf_conntrack-sysctl.rst
index 834945ebc4cdf3ce3fffeb477d2d9b1047b7a7a4..1120d71f28d7bca75e6a540c03c539175c3d6cc2 100644 (file)
--- a/Documentation/networking/nf_conntrack-sysctl.rst
+++ b/Documentation/networking/nf_conntrack-sysctl.rst
@@ -70,15 +70,6 @@ nf_conntrack_generic_timeout - INTEGER (seconds)
        Default for generic timeout.  This refers to layer 4 unknown/unsupported
        protocols.
 
-nf_conntrack_helper - BOOLEAN
-       - 0 - disabled (default)
-       - not 0 - enabled
-
-       Enable automatic conntrack helper assignment.
-       If disabled it is required to set up iptables rules to assign
-       helpers to connections.  See the CT target description in the
-       iptables-extensions(8) man page for further information.
-
 nf_conntrack_icmp_timeout - INTEGER (seconds)
        default 30