summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-07-19 21:25:10 -0700
committerDavid S. Miller <davem@davemloft.net>2019-07-19 21:25:10 -0700
commit9a2f97bb8ddddbf655ce1fcdf688dcec19deb59f (patch)
treeca7bba0b4cb27d75f910d354845d70e67e298269 /drivers/net
parent31cc088a4f5d83481c6f5041bd6eb06115b974af (diff)
parentdfee0e99bcff718fa14d973c41f161220fdcb7d5 (diff)
downloadlinux-9a2f97bb8ddddbf655ce1fcdf688dcec19deb59f.tar.gz
linux-9a2f97bb8ddddbf655ce1fcdf688dcec19deb59f.tar.bz2
linux-9a2f97bb8ddddbf655ce1fcdf688dcec19deb59f.zip
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 fixes for net: 1) Fix a deadlock when module is requested via netlink_bind() in nfnetlink, from Florian Westphal. 2) Fix ipt_rpfilter and ip6t_rpfilter with VRF, from Miaohe Lin. 3) Skip master comparison in SIP helper to fix expectation clash under two valid scenarios, from xiao ruizhu. 4) Remove obsolete comments in nf_conntrack codebase, from Yonatan Goldschmidt. 5) Fix redirect extension module autoload, from Christian Hesse. 6) Fix incorrect mssg option sent to client in synproxy, from Fernando Fernandez. 7) Fix incorrect window calculations in TCP conntrack, from Florian Westphal. 8) Don't bail out when updating basechain policy due to recent offload works, also from Florian. 9) Allow symhash to use modulus 1 as other hash extensions do, from Laura.Garcia. 10) Missing NAT chain module autoload for the inet family, from Phil Sutter. 11) Fix missing adjustment of TCP RST packet in synproxy, from Fernando Fernandez. 12) Skip EAGAIN path when nft_meta_bridge is built-in or not selected. 13) Conntrack bridge does not depend on nf_tables_bridge. 14) Turn NF_TABLES_BRIDGE into tristate to fix possible link break of nft_meta_bridge, from Arnd Bergmann. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions