From: David S. Miller Date: Sun, 7 Apr 2013 16:22:06 +0000 (-0400) Subject: Merge branch 'master' of git://1984.lsi.us.es/nf-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d16658206a3a9a1cbe2cc062bee9ea7e782293a5;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge branch 'master' of git://1984.lsi.us.es/nf-next Pablo Neira Ayuso says: ==================== The following patchset contains Netfilter and IPVS updates for your net-next tree, most relevantly they are: * Add net namespace support to NFLOG, ULOG and ebt_ulog and NFQUEUE. The LOG and ebt_log target has been also adapted, but they still depend on the syslog netnamespace that seems to be missing, from Gao Feng. * Don't lose indications of congestion in IPv6 fragmentation handling, from Hannes Frederic Sowa.i * IPVS conversion to use RCU, including some code consolidation patches and optimizations, also some from Julian Anastasov. * cpu fanout support for NFQUEUE, from Holger Eitzenberger. * Better error reporting to userspace when dropping packets from all our _*_[xfrm|route]_me_harder functions, from Patrick McHardy. ==================== Signed-off-by: David S. Miller --- d16658206a3a9a1cbe2cc062bee9ea7e782293a5 diff --cc net/ipv4/netfilter/ipt_ULOG.c index e7f8cad1139,642ecfb711b..8799c836cca --- a/net/ipv4/netfilter/ipt_ULOG.c +++ b/net/ipv4/netfilter/ipt_ULOG.c @@@ -172,11 -187,11 +187,11 @@@ static void ipt_ulog_packet(unsigned in else copy_len = loginfo->copy_range; - size = NLMSG_SPACE(sizeof(*pm) + copy_len); + size = nlmsg_total_size(sizeof(*pm) + copy_len); - ub = &ulog_buffers[groupnum]; + ub = &ulog->ulog_buffers[groupnum]; - spin_lock_bh(&ulog_lock); + spin_lock_bh(&ulog->lock); if (!ub->skb) { if (!(ub->skb = ulog_alloc_skb(size)))