diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-20 12:46:26 -0400 |
| commit | 61816596d1c9026d0ecb20c44f90452c41596ffe (patch) | |
| tree | 3027ed6dc62f71e14b9d525405747fa0eb8f074d /Documentation/networking | |
| parent | 23a9072e3af0d9538e25837fb2b56bb94e4a8e67 (diff) | |
| parent | da2191e31409d1058dcbed44e8f53e39a40e86b3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/ipvs-sysctl.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt index f2a2488f1bf3..9573d0c48c6e 100644 --- a/Documentation/networking/ipvs-sysctl.txt +++ b/Documentation/networking/ipvs-sysctl.txt | |||
| @@ -15,6 +15,13 @@ amemthresh - INTEGER | |||
| 15 | enabled and the variable is automatically set to 2, otherwise | 15 | enabled and the variable is automatically set to 2, otherwise |
| 16 | the strategy is disabled and the variable is set to 1. | 16 | the strategy is disabled and the variable is set to 1. |
| 17 | 17 | ||
| 18 | backup_only - BOOLEAN | ||
| 19 | 0 - disabled (default) | ||
| 20 | not 0 - enabled | ||
| 21 | |||
| 22 | If set, disable the director function while the server is | ||
| 23 | in backup mode to avoid packet loops for DR/TUN methods. | ||
| 24 | |||
| 18 | conntrack - BOOLEAN | 25 | conntrack - BOOLEAN |
| 19 | 0 - disabled (default) | 26 | 0 - disabled (default) |
| 20 | not 0 - enabled | 27 | not 0 - enabled |