Merge tag 'drm-next-2018-12-27' of git://anongit.freedesktop.org/drm/drm

[sfrench/cifs-2.6.git] / Documentation / networking / nf_conntrack-sysctl.txt

diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt
index 1669dc2419fdcba80093a8cad13b4ab43ff14e03..f75c2ce6e13602283fd6322440e18b3b5b5cc7ad 100644 (file)
--- a/Documentation/networking/nf_conntrack-sysctl.txt
+++ b/Documentation/networking/nf_conntrack-sysctl.txt
@@ -157,7 +157,16 @@ nf_conntrack_udp_timeout - INTEGER (seconds)
        default 30
 
 nf_conntrack_udp_timeout_stream - INTEGER (seconds)
-       default 180
+       default 120
 
        This extended timeout will be used in case there is an UDP stream
        detected.
+
+nf_conntrack_gre_timeout - INTEGER (seconds)
+       default 30
+
+nf_conntrack_gre_timeout_stream - INTEGER (seconds)
+       default 180
+
+       This extended timeout will be used in case there is an GRE stream
+       detected.