diff options
author | David S. Miller | 2013-07-01 02:35:13 +0200 |
---|---|---|
committer | David S. Miller | 2013-07-01 02:35:13 +0200 |
commit | 4e144d3a807d6d2aa03d2cb234d88ef1a140e8c3 (patch) | |
tree | 7780ce6a8c84068820f8bbcc5116db6430db3d3b /net/netfilter/ipvs/ip_vs_nq.c | |
parent | bonding: combine pr_debugs in bond_set_dev_addr into one (diff) | |
parent | netfilter: nf_queue: add NFQA_SKB_CSUM_NOTVERIFIED info flag (diff) | |
download | kernel-qcow2-linux-4e144d3a807d6d2aa03d2cb234d88ef1a140e8c3.tar.gz kernel-qcow2-linux-4e144d3a807d6d2aa03d2cb234d88ef1a140e8c3.tar.xz kernel-qcow2-linux-4e144d3a807d6d2aa03d2cb234d88ef1a140e8c3.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
The following batch contains Netfilter/IPVS updates for net-next,
they are:
* Enforce policy to several nfnetlink subsystem, from Daniel
Borkmann.
* Use xt_socket to match the third packet (to perform simplistic
socket-based stateful filtering), from Eric Dumazet.
* Avoid large timeout for picked up from the middle TCP flows,
from Florian Westphal.
* Exclude IPVS from struct net if IPVS is disabled and removal
of unnecessary included header file, from JunweiZhang.
* Release SCTP connection immediately under load, to mimic current
TCP behaviour, from Julian Anastasov.
* Replace and enhance SCTP state machine, from Julian Anastasov.
* Add tweak to reduce sync traffic in the presence of persistence,
also from Julian Anastasov.
* Add tweak for the IPVS SH scheduler not to reject connections
directed to a server, choose a new one instead, from Alexander
Frolkin.
* Add support for sloppy TCP and SCTP modes, that creates state
information on any packet, not only initial handshake packets,
from Alexander Frolkin.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_nq.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_nq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_nq.c b/net/netfilter/ipvs/ip_vs_nq.c index 646cfd4baa73..d8d9860934fe 100644 --- a/net/netfilter/ipvs/ip_vs_nq.c +++ b/net/netfilter/ipvs/ip_vs_nq.c @@ -55,7 +55,8 @@ ip_vs_nq_dest_overhead(struct ip_vs_dest *dest) * Weighted Least Connection scheduling */ static struct ip_vs_dest * -ip_vs_nq_schedule(struct ip_vs_service *svc, const struct sk_buff *skb) +ip_vs_nq_schedule(struct ip_vs_service *svc, const struct sk_buff *skb, + struct ip_vs_iphdr *iph) { struct ip_vs_dest *dest, *least = NULL; unsigned int loh = 0, doh; |