diff options
| author |   Benjamin Poirier <bpoirier@suse.com> | 2016-03-21 13:21:39 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-21 22:56:37 -0400 |
| commit | 6b226e2f801253edf9d2f2afda538f550ae2b17d (patch) | |
| tree | 84945df99d55b2ec740ea01e941e8fa5964b3ea0 /Documentation/networking/ip-sysctl.txt | |
| parent | Merge branch 'bridge-gso-segs-and-size' (diff) | |
| download | linux-dev-6b226e2f801253edf9d2f2afda538f550ae2b17d.tar.xz linux-dev-6b226e2f801253edf9d2f2afda538f550ae2b17d.zip | |
net: Fix indentation of the conf/ documentation block
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index d5df40c75aa4..d3768e8dfab6 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 |