diff options
| author |  Takashi Iwai <tiwai@suse.de>
| 2018-04-25 10:41:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de>
| 2018-04-25 16:44:36 +0200 |
| commit | 4d31c6e41ed2f95f97a19766812797dabd82a5ee (patch) | |
| tree | e1f81f4f0108ff86f85b8e17b025b21609aec7b2 /Documentation/networking/ip-sysctl.txt | |
| parent | ALSA: hda - Sanity check of access to SPDIF controls array (diff) | |
| parent | ALSA: hda - Skip jack and others for non-existing PCM streams (diff) | |
| download | linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.tar.gz linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.tar.bz2 linux-4d31c6e41ed2f95f97a19766812797dabd82a5ee.zip | |
Merge branch 'for-linus' into for-next
Back-merge 4.17-rc3 fixes for further development.
This will bump the base to 4.17-rc2, too.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Documentation/networking/ip-sysctl.txt')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 5dc1a040a2f1..b583a73cf95f 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -1390,26 +1390,26 @@ mld_qrv - INTEGER Default: 2 (as specified by RFC3810 9.1) Minimum: 1 (as specified by RFC6636 4.5) -max_dst_opts_cnt - INTEGER +max_dst_opts_number - INTEGER Maximum number of non-padding TLVs allowed in a Destination options extension header. If this value is less than zero then unknown options are disallowed and the number of known TLVs allowed is the absolute value of this number. Default: 8 -max_hbh_opts_cnt - INTEGER +max_hbh_opts_number - INTEGER Maximum number of non-padding TLVs allowed in a Hop-by-Hop options extension header. If this value is less than zero then unknown options are disallowed and the number of known TLVs allowed is the absolute value of this number. Default: 8 -max dst_opts_len - INTEGER +max_dst_opts_length - INTEGER Maximum length allowed for a Destination options extension header. Default: INT_MAX (unlimited) -max hbh_opts_len - INTEGER +max_hbh_length - INTEGER Maximum length allowed for a Hop-by-Hop options extension header. Default: INT_MAX (unlimited) |