Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says:

====================
Netfilter updates for net-next

A small batch with accumulated updates in nf-next, mostly IPVS updates,
they are:

1) Add 64-bits stats counters to IPVS, from Julian Anastasov.

2) Move NETFILTER_XT_MATCH_ADDRTYPE out of NETFILTER_ADVANCED as docker
seem to require this, from Anton Blanchard.

3) Use boolean instead of numeric value in set_match_v*(), from
coccinelle via Fengguang Wu.

4) Allows rescheduling of new connections in IPVS when port reuse is
detected, from Marcelo Ricardo Leitner.

5) Add missing bits to support arptables extensions from nft_compat,
from Arturo Borrero.

Patrick is preparing a large batch to enhance the set infrastructure,
named expressions among other things, that should follow up soon after
this batch.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 21 insertions, 0 deletions

diff --git a/Documentation/networking/ipvs-sysctl.txt b/Documentation/networking/ipvs-sysctl.txt
index 7a3c04729591..3ba709531adb 100644
--- a/Documentation/networking/ipvs-sysctl.txt
+++ b/Documentation/networking/ipvs-sysctl.txt
@@ -22,6 +22,27 @@ backup_only - BOOLEAN
         If set, disable the director function while the server is
         in backup mode to avoid packet loops for DR/TUN methods.
 
+conn_reuse_mode - INTEGER
+        1 - default
+
+        Controls how ipvs will deal with connections that are detected
+        port reuse. It is a bitmap, with the values being:
+
+        0: disable any special handling on port reuse. The new
+        connection will be delivered to the same real server that was
+        servicing the previous connection. This will effectively
+        disable expire_nodest_conn.
+
+        bit 1: enable rescheduling of new connections when it is safe.
+        That is, whenever expire_nodest_conn and for TCP sockets, when
+        the connection is in TIME_WAIT state (which is only possible if
+        you use NAT mode).
+
+        bit 2: it is bit 1 plus, for TCP connections, when connections
+        are in FIN_WAIT state, as this is the last state seen by load
+        balancer in Direct Routing mode. This bit helps on adding new
+        real servers to a very busy cluster.
+
 conntrack - BOOLEAN
         0 - disabled (default)
         not 0 - enabled