summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-01 12:14:26 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-01 12:14:26 -0700
commit44e63941e789e10409186224ba897ab50c3fa7e0 (patch)
tree180adf775f6bb9ab401303e67fc7c6d0c0642d10 /Documentation
parentb983e51a73b60b358e2c15a64c0c489cb266fe67 (diff)
parent07961ac7c0ee8b546658717034fe692fd12eefa9 (diff)
downloadop-kernel-dev-44e63941e789e10409186224ba897ab50c3fa7e0.zip
op-kernel-dev-44e63941e789e10409186224ba897ab50c3fa7e0.tar.gz
Merge v3.9-rc5 into usb-next
We want the fixes here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/networking/ipvs-sysctl.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt
index f2a2488..9573d0c 100644
--- a/Documentation/networking/ipvs-sysctl.txt
+++ b/Documentation/networking/ipvs-sysctl.txt
@@ -15,6 +15,13 @@ amemthresh - INTEGER
enabled and the variable is automatically set to 2, otherwise
the strategy is disabled and the variable is set to 1.
+backup_only - BOOLEAN
+ 0 - disabled (default)
+ not 0 - enabled
+
+ If set, disable the director function while the server is
+ in backup mode to avoid packet loops for DR/TUN methods.
+
conntrack - BOOLEAN
0 - disabled (default)
not 0 - enabled
OpenPOWER on IntegriCloud