Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1565375 > unrolled thread
| Started by | Jiri Kosina <jikos@kernel.org> |
|---|---|
| First post | 2017-01-24 01:10 +0100 |
| Last post | 2017-01-24 01:10 +0100 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
[PATCH 2/2] Revert "netfilter: fix nf_conntrack_helper documentation" Jiri Kosina <jikos@kernel.org> - 2017-01-24 01:10 +0100
| From | Jiri Kosina <jikos@kernel.org> |
|---|---|
| Date | 2017-01-24 01:10 +0100 |
| Subject | [PATCH 2/2] Revert "netfilter: fix nf_conntrack_helper documentation" |
| Message-ID | <t2WQp-581-5@gated-at.bofh.it> |
From: Jiri Kosina <jkosina@suse.cz> This reverts commit 486dcf43da7815baa615822f3e46883ccca5400f. The commit that flipped the default has been reverted as well. Signed-off-by: Jiri Kosina <jkosina@suse.cz> --- Documentation/networking/nf_conntrack-sysctl.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt index 497d668288f9..cdeb9d6a44c7 100644 --- a/Documentation/networking/nf_conntrack-sysctl.txt +++ b/Documentation/networking/nf_conntrack-sysctl.txt @@ -62,13 +62,10 @@ nf_conntrack_generic_timeout - INTEGER (seconds) protocols. nf_conntrack_helper - BOOLEAN - 0 - disabled (default) - not 0 - enabled + 0 - disabled + not 0 - enabled (default) 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 -- 2.11.0
Back to top | Article view | linux.kernel
csiph-web