Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1565375
| Path | csiph.com!1.us.feeder.erje.net!2.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!feeds.phibee-telecom.net!news.panservice.it!bofh.it!news.nic.it!robomod |
|---|---|
| From | Jiri Kosina <jikos@kernel.org> |
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/2] Revert "netfilter: fix nf_conntrack_helper documentation" |
| Date | Tue, 24 Jan 2017 01:10:01 +0100 |
| Message-ID | <t2WQp-581-5@gated-at.bofh.it> (permalink) |
| X-X-Sender | jkosina@pobox.suse.cz |
| User-Agent | Alpine 2.20 (LSU 67 2015-01-07) |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=US-ASCII |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 33 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kernel@vger.kernel.org, info@jablonka.cz, Linus Torvalds <torvalds@linux-foundation.org> |
| X-Original-Date | Tue, 24 Jan 2017 01:06:27 +0100 (CET) |
| X-Original-Message-ID | <alpine.LSU.2.20.1701240058540.25515@cbobk.fhfr.pm> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1565375 |
Show key headers only | View raw
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 linux.kernel | Previous | Next | Find similar | Unroll thread
[PATCH 2/2] Revert "netfilter: fix nf_conntrack_helper documentation" Jiri Kosina <jikos@kernel.org> - 2017-01-24 01:10 +0100
csiph-web