• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 244ebd9f
    David S. Miller authored
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter updates for net-next
    
    The following batch contains netfilter updates for net-next. Basically,
    enhancements for xt_recent, skip zeroing of timer in conntrack, fix
    linking problem with recent redirect support for nf_tables, ipset
    updates and a couple of cleanups. More specifically, they are:
    
    1) Rise maximum number per IP address to be remembered in xt_recent
       while retaining backward compatibility, from Florian Westphal.
    
    2) Skip zeroing timer area in nf_conn objects, also from Florian.
    
    3) Inspect IPv4 and IPv6 traffic from the bridge to allow filtering using
       using meta l4proto and transport layer header, from Alvaro Neira.
    
    4) Fix linking problems in the new redirect support when CONFIG_IPV6=n
       and IP6_NF_IPTABLES=n.
    
    And ipset updates from Jozsef Kadlecsik:
    
    5) Support updating element extensions when the set is full (fixes
       netfilter bugzilla id 880).
    
    6) Fix set match with 32-bits userspace / 64-bits kernel.
    
    7) Indicate explicitly when /0 networks are supported in ipset.
    
    8) Simplify cidr handling for hash:*net* types.
    
    9) Allocate the proper size of memory when /0 networks are supported.
    
    10) Explicitly add padding elements to hash:net,net and hash:net,port,
        because the elements must be u32 sized for the used hash function.
    
    Jozsef is also cooking ipset RCU conversion which should land soon if
    they reach the merge window in time.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    244ebd9f
nf_conntrack_core.c 48.7 KB