diff options
| author | John Stultz <john.stultz@linaro.org> | 2018-09-26 14:49:02 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2018-09-26 14:49:02 -0700 |
| commit | 5daa8a6cafc50ea2026a3b27066a3248507c4ff5 (patch) | |
| tree | a511e8fb8d85b1d0e4e72dcec698f79d9ad7862f /Documentation | |
| parent | ab9a9d347ec1d886d08df3212e33ba50fbb05c26 (diff) | |
| parent | e709f59a8cd2405f59451073c58b3e335c643b27 (diff) | |
Merge remote-tracking branch 'mirror-android-4.14' into android-hikey-linaro-4.14
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index 57f55bf0b906..6a98ad3b3586 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt @@ -133,14 +133,11 @@ min_adv_mss - INTEGER IP Fragmentation: -ipfrag_high_thresh - INTEGER - Maximum memory used to reassemble IP fragments. When - ipfrag_high_thresh bytes of memory is allocated for this purpose, - the fragment handler will toss packets until ipfrag_low_thresh - is reached. This also serves as a maximum limit to namespaces - different from the initial one. - -ipfrag_low_thresh - INTEGER +ipfrag_high_thresh - LONG INTEGER + Maximum memory used to reassemble IP fragments. + +ipfrag_low_thresh - LONG INTEGER + (Obsolete since linux-4.17) Maximum memory used to reassemble IP fragments before the kernel begins to remove incomplete fragment queues to free up resources. The kernel still accepts new fragments for defragmentation. |