summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/8390/8390p.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-02-09 14:20:00 -0800
committerDavid S. Miller <davem@davemloft.net>2014-02-09 14:20:00 -0800
commitf41f03196041f91acad2b6d2b3e1f800aed60100 (patch)
tree2981088eb28919bf32e8040b0ad73beead0ec815 /drivers/net/ethernet/8390/8390p.c
parent4a5ab4e224288403b0b4b6b8c4d339323150c312 (diff)
parent6d8c00d58e9e484fdc41aaaf62e5d8364efe375a (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
Pablo Neira Ayuso says: ==================== Netfilter/nftables/IPVS fixes for net The following patchset contains Netfilter/IPVS fixes, mostly nftables fixes, most relevantly they are: * Fix a crash in the h323 conntrack NAT helper due to expectation list corruption, from Alexey Dobriyan. * A couple of RCU race fixes for conntrack, one manifests by hitting BUG_ON in nf_nat_setup_info() and the destroy path, patches from Andrey Vagin and me. * Dump direction attribute in nft_ct only if it is set, from Arturo Borrero. * Fix IPVS bug in its own connection tracking system that may lead to copying only 4 bytes of the IPv6 address when initializing the ip_vs_conn object, from Michal Kubecek. * Fix -EBUSY errors in nftables when deleting the rules, chain and tables in a row due mixture of asynchronous and synchronous object releasing, from me. * Three fixes for the nf_tables set infrastructure when using intervals and mappings, from me. * Four patches to fixing the nf_tables log, reject and ct expressions from the new inet table, from Patrick McHardy. * Fix memory overrun in the map that is used to dynamically allocate names from anonymous sets, also from Patrick. * Fix a potential oops if you dump a set with NFPROTO_UNSPEC and a table name, from Patrick McHardy. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/8390/8390p.c')
0 files changed, 0 insertions, 0 deletions