[PATCH 1/2] net: Fix indentation of the conf/ documentation block

[PATCH 1/2] net: Fix indentation of the conf/ documentation block

[Benjamin Poirier]

Commit d67ef35fff67 ("clarify documentation for
net.ipv4.igmp_max_memberships") mistakenly indented a block of
documentation such that it now looks like it belongs to a specific sysctl.
Restore that block's original position.

Cc: Jeremy Eder <jeder@redhat.com>
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
---
 Documentation/networking/ip-sysctl.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index d5df40c..d3768e8 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -946,16 +946,16 @@ igmp_max_memberships - INTEGER
 	The value 5459 assumes no IP header options, so in practice
 	this number may be lower.
 
-	conf/interface/*  changes special settings per interface (where
-	"interface" is the name of your network interface)
-
-	conf/all/*	  is special, changes the settings for all interfaces
-
 igmp_qrv - INTEGER
 	 Controls the IGMP query robustness variable (see RFC2236 8.1).
 	 Default: 2 (as specified by RFC2236 8.1)
 	 Minimum: 1 (as specified by RFC6636 4.5)
 
+conf/interface/*  changes special settings per interface (where
+"interface" is the name of your network interface)
+
+conf/all/*	  is special, changes the settings for all interfaces
+
 log_martians - BOOLEAN
 	Log packets with impossible addresses to kernel log.
 	log_martians for the interface will be enabled if at least one of
-- 
2.7.2

[PATCH 2/2] igmp: Document sysctl_igmp_max_msf

[Benjamin Poirier]

Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
---
 Documentation/networking/ip-sysctl.txt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index d3768e8..b183e2b 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -946,10 +946,15 @@ igmp_max_memberships - INTEGER
 	The value 5459 assumes no IP header options, so in practice
 	this number may be lower.
 
+igmp_max_msf - INTEGER
+	Maximum number of addresses allowed in the source filter list for a
+	multicast group.
+	Default: 10
+
 igmp_qrv - INTEGER
-	 Controls the IGMP query robustness variable (see RFC2236 8.1).
-	 Default: 2 (as specified by RFC2236 8.1)
-	 Minimum: 1 (as specified by RFC6636 4.5)
+	Controls the IGMP query robustness variable (see RFC2236 8.1).
+	Default: 2 (as specified by RFC2236 8.1)
+	Minimum: 1 (as specified by RFC6636 4.5)
 
 conf/interface/*  changes special settings per interface (where
 "interface" is the name of your network interface)
-- 
2.7.2

Re: [PATCH 1/2] net: Fix indentation of the conf/ documentation block

[David Miller]

From: Benjamin Poirier <bpoirier@suse.com>
Date: Mon, 21 Mar 2016 13:21:39 -0700

> Commit d67ef35fff67 ("clarify documentation for
> net.ipv4.igmp_max_memberships") mistakenly indented a block of
> documentation such that it now looks like it belongs to a specific sysctl.
> Restore that block's original position.
> 
> Cc: Jeremy Eder <jeder@redhat.com>
> Signed-off-by: Benjamin Poirier <bpoirier@suse.com>

Applied.

Re: [PATCH 2/2] igmp: Document sysctl_igmp_max_msf

[David Miller]

From: Benjamin Poirier <bpoirier@suse.com>
Date: Mon, 21 Mar 2016 13:21:40 -0700

> Signed-off-by: Benjamin Poirier <bpoirier@suse.com>

Applied.