Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[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 f55599c62c9d61335005202146fdad75c8c133b9..4fb51d32fccc2acd4ebaa1347dcf51fb49cab90d 100644 (file)
--- a/Documentation/networking/nf_conntrack-sysctl.txt
+++ b/Documentation/networking/nf_conntrack-sysctl.txt
@@ -7,12 +7,13 @@ nf_conntrack_acct - BOOLEAN
        Enable connection tracking flow accounting. 64-bit byte and packet
        counters per flow are added.
 
-nf_conntrack_buckets - INTEGER (read-only)
+nf_conntrack_buckets - INTEGER
        Size of hash table. If not specified as parameter during module
        loading, the default size is calculated by dividing total memory
        by 16384 to determine the number of buckets but the hash table will
        never have fewer than 32 and limited to 16384 buckets. For systems
        with more than 4GB of memory it will be 65536 buckets.
+       This sysctl is only writeable in the initial net namespace.
 
 nf_conntrack_checksum - BOOLEAN
        0 - disabled