summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorDavid S. Miller2013-07-01 02:35:13 +0200
committerDavid S. Miller2013-07-01 02:35:13 +0200
commit4e144d3a807d6d2aa03d2cb234d88ef1a140e8c3 (patch)
tree7780ce6a8c84068820f8bbcc5116db6430db3d3b /README
parentbonding: combine pr_debugs in bond_set_dev_addr into one (diff)
parentnetfilter: nf_queue: add NFQA_SKB_CSUM_NOTVERIFIED info flag (diff)
downloadkernel-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 'README')
0 files changed, 0 insertions, 0 deletions