aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_scalable.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-11-04 19:48:57 -0500
committerDavid S. Miller <davem@davemloft.net>2013-11-04 19:48:57 -0500
commitf8785c55141d698d988c6a1ffe4530bc7fa6e886 (patch)
treedc629fe50865a6f3e5e47eaf8c4a9e3e1995bbec /net/ipv4/tcp_scalable.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next (diff)
parentnetfilter: nft_compat: use _safe version of list_for_each (diff)
downloadlinux-dev-f8785c55141d698d988c6a1ffe4530bc7fa6e886.tar.xz
linux-dev-f8785c55141d698d988c6a1ffe4530bc7fa6e886.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nftables
Pablo Neira Ayuso says: ==================== This batch contains fives nf_tables patches for your net-next tree, they are: * Fix possible use after free in the module removal path of the x_tables compatibility layer, from Dan Carpenter. * Add filter chain type for the bridge family, from myself. * Fix Kconfig dependencies of the nf_tables bridge family with the core, from myself. * Fix sparse warnings in nft_nat, from Tomasz Bursztyka. * Remove duplicated include in the IPv4 family support for nf_tables, from Wei Yongjun. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_scalable.c')
0 files changed, 0 insertions, 0 deletions