summaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-01-15 07:50:25 +0100
committerDavid S. Miller <davem@davemloft.net>2015-01-15 07:50:25 +0100
commit4e7a84b1a5bc8094522fd11f628b00c4b4e78b4d (patch)
treeb5bccf157524440d73b6dabaf1b33d0f1e4242f5 /net/socket.c
parentMerge branch 'vxlan_group_policy_extension' (diff)
parentnetfilter: conntrack: Remove nf_ct_conntrack_flush_report (diff)
downloadlinux-4e7a84b1a5bc8094522fd11f628b00c4b4e78b4d.tar.xz
linux-4e7a84b1a5bc8094522fd11f628b00c4b4e78b4d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says: ==================== netfilter updates for net-next The following patchset contains netfilter updates for net-next, just a bunch of cleanups and small enhancement to selectively flush conntracks in ctnetlink, more specifically the patches are: 1) Rise default number of buckets in conntrack from 16384 to 65536 in systems with >= 4GBytes, patch from Marcelo Leitner. 2) Small refactor to save one level on indentation in xt_osf, from Joe Perches. 3) Remove unnecessary sizeof(char) in nf_log, from Fabian Frederick. 4) Another small cleanup to remove redundant variable in nfnetlink, from Duan Jiong. 5) Fix compilation warning in nfnetlink_cthelper on parisc, from Chen Gang. 6) Fix wrong format in debugging for ctseqadj, from Gao feng. 7) Selective conntrack flushing through the mark for ctnetlink, patch from Kristian Evensen. 8) Remove nf_ct_conntrack_flush_report() exported symbol now that is not required anymore after the selective flushing patch, again from Kristian. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
0 files changed, 0 insertions, 0 deletions