• David S. Miller's avatar
    Merge branch 'master' of git://1984.lsi.us.es/nf-next · da134825
    David S. Miller authored
    Pablo Neira Ayuso says:
    
    ====================
    The following patchset contains Netfilter/IPVS updates for
    your net-next tree, they are:
    
    * Better performance in nfnetlink_queue by avoiding copy from the
      packet to netlink message, from Eric Dumazet.
    
    * Remove unnecessary locking in the exit path of ebt_ulog, from Gao Feng.
    
    * Use new function ipv6_iface_scope_id in nf_ct_ipv6, from Hannes Frederic Sowa.
    
    * A couple of sparse fixes for IPVS, from Julian Anastasov.
    
    * Use xor hashing in nfnetlink_queue, as suggested by Eric Dumazet, from
      myself.
    
    * Allow to dump expectations per master conntrack via ctnetlink, from myself.
    
    * A couple of cleanups to use PTR_RET in module init path, from Silviu-Mihai
      Popescu.
    
    * Remove nf_conntrack module a bit faster if netns are in use, from
      Vladimir Davydov.
    
    * Use checksum_partial in ip6t_NPT, from YOSHIFUJI Hideaki.
    
    * Sparse fix for nf_conntrack, from Stephen Hemminger.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    da134825
ip_vs.h 45.3 KB