netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 03/11] netfilter: fix nf_conntrack_helper documentation
Date: Wed, 30 Nov 2016 22:57:17 +0100	[thread overview]
Message-ID: <1480543045-3389-4-git-send-email-pablo@netfilter.org> (raw)
In-Reply-To: <1480543045-3389-1-git-send-email-pablo@netfilter.org>

From: Florian Westphal <fw@strlen.de>

Since kernel 4.7 this defaults to off.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 Documentation/networking/nf_conntrack-sysctl.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt
index 399e4e866a9c..433b6724797a 100644
--- a/Documentation/networking/nf_conntrack-sysctl.txt
+++ b/Documentation/networking/nf_conntrack-sysctl.txt
@@ -62,10 +62,13 @@ nf_conntrack_generic_timeout - INTEGER (seconds)
 	protocols.
 
 nf_conntrack_helper - BOOLEAN
-	0 - disabled
-	not 0 - enabled (default)
+	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
-- 
2.1.4


  parent reply	other threads:[~2016-11-30 21:57 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-30 21:57 [PATCH 00/11] Netfilter fixes for net Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 01/11] netfilter: Update ip_route_me_harder to consider L3 domain Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 02/11] netfilter: Update nf_send_reset6 " Pablo Neira Ayuso
2016-11-30 21:57 ` Pablo Neira Ayuso [this message]
2016-11-30 21:57 ` [PATCH 04/11] netfilter: nft_hash: validate maximum value of u32 netlink hash attribute Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 05/11] netfilter: nat: fix cmp return value Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 06/11] netfilter: nat: switch to new rhlist interface Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 07/11] netfilter: nf_tables: fix inconsistent element expiration calculation Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 08/11] netfilter: nft_range: add the missing NULL pointer check Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 09/11] netfilter: nat: fix crash when conntrack entry is re-used Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 10/11] netfilter: ipv6: nf_defrag: drop mangled skb on ream error Pablo Neira Ayuso
2016-11-30 21:57 ` [PATCH 11/11] netfilter: arp_tables: fix invoking 32bit "iptable -P INPUT ACCEPT" failed in 64bit kernel Pablo Neira Ayuso
2016-12-01 16:13 ` [PATCH 00/11] Netfilter fixes for net David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1480543045-3389-4-git-send-email-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).