diff options
| author | David S. Miller <davem@davemloft.net> | 2021-11-19 14:00:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-19 14:00:01 +0300 |
| commit | d6821c5bc6b678808a6a5c07e4a5bd3deac9d9f4 (patch) | |
| tree | 2b763adf12b2abeb6b96d1ed3e4e7f6863a7c60f /Documentation | |
| parent | 8d0112ac6fd001f95aabb084ec2ccaa3637bc344 (diff) | |
| parent | a2acf0c0e2da29950d0361a3b5ea05e8d0351dfe (diff) | |
| download | linux-d6821c5bc6b678808a6a5c07e4a5bd3deac9d9f4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says:
====================
Netfilter fixes for net
The following patchset contains Netfilter/IPVS fixes for net:
1) Add selftest for vrf+conntrack, from Florian Westphal.
2) Extend nfqueue selftest to cover nfqueue, also from Florian.
3) Remove duplicated include in nft_payload, from Wan Jiabing.
4) Several improvements to the nat port shadowing selftest,
from Phil Sutter.
5) Fix filtering of reply tuple in ctnetlink, from Florent Fourcot.
6) Do not override error with -EINVAL in filter setup path, also
from Florent.
7) Honor sysctl_expire_nodest_conn regardless conn_reuse_mode for
reused connections, from yangxingwu.
8) Replace snprintf() by sysfs_emit() in xt_IDLETIMER as reported
by Coccinelle, from Jing Yao.
9) Incorrect IPv6 tunnel match in flowtable offload, from Will
Mortensen.
10) Switch port shadow selftest to use socat, from Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/ipvs-sysctl.rst | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/networking/ipvs-sysctl.rst b/Documentation/networking/ipvs-sysctl.rst index 95ef56d62077..387fda80f05f 100644 --- a/Documentation/networking/ipvs-sysctl.rst +++ b/Documentation/networking/ipvs-sysctl.rst @@ -37,8 +37,7 @@ conn_reuse_mode - INTEGER 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. + servicing the previous connection. bit 1: enable rescheduling of new connections when it is safe. That is, whenever expire_nodest_conn and for TCP sockets, when |