• David S. Miller's avatar
    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 72c39a0a
    David S. Miller authored
    Pablo Neira Ayuso says:
    
    ====================
    This is another batch containing Netfilter/IPVS updates for your net-next
    tree, they are:
    
    * Six patches to make the ipt_CLUSTERIP target support netnamespace,
      from Gao feng.
    
    * Two cleanups for the nf_conntrack_acct infrastructure, introducing
      a new structure to encapsulate conntrack counters, from Holger
      Eitzenberger.
    
    * Fix missing verdict in SCTP support for IPVS, from Daniel Borkmann.
    
    * Skip checksum recalculation in SCTP support for IPVS, also from
      Daniel Borkmann.
    
    * Fix behavioural change in xt_socket after IP early demux, from
      Florian Westphal.
    
    * Fix bogus large memory allocation in the bitmap port set type in ipset,
      from Jozsef Kadlecsik.
    
    * Fix possible compilation issues in the hash netnet set type in ipset,
      also from Jozsef Kadlecsik.
    
    * Define constants to identify netlink callback data in ipset dumps,
      again from Jozsef Kadlecsik.
    
    * Use sock_gen_put() in xt_socket to replace xt_socket_put_sk,
      from Eric Dumazet.
    
    * Improvements for the SH scheduler in IPVS, from Alexander Frolkin.
    
    * Remove extra delay due to unneeded rcu barrier in IPVS net namespace
      cleanup path, from Julian Anastasov.
    
    * Save some cycles in ip6t_REJECT by skipping checksum validation in
      packets leaving from our stack, from Stanislav Fomichev.
    
    * Fix IPVS_CMD_ATTR_MAX definition in IPVS, larger that required, from
      Julian Anastasov.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    72c39a0a
br_netfilter.c 28.6 KB