projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nvme-4.18' of git://git.infradead.org/nvme into for-linus
[linux-2.6-block.git]
/
Documentation
/
networking
/
nf_conntrack-sysctl.txt
diff --git
a/Documentation/networking/nf_conntrack-sysctl.txt
b/Documentation/networking/nf_conntrack-sysctl.txt
index 433b6724797ad7e9476f041c7f0e2dcd77ca8579..1669dc2419fdcba80093a8cad13b4ab43ff14e03 100644
(file)
--- a/
Documentation/networking/nf_conntrack-sysctl.txt
+++ b/
Documentation/networking/nf_conntrack-sysctl.txt
@@
-156,7
+156,7
@@
nf_conntrack_timestamp - BOOLEAN
nf_conntrack_udp_timeout - INTEGER (seconds)
default 30
-nf_conntrack_udp_timeout_stream
2
- INTEGER (seconds)
+nf_conntrack_udp_timeout_stream - INTEGER (seconds)
default 180
This extended timeout will be used in case there is an UDP stream