• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 5428aef8
    David S. Miller authored
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter updates for net-next
    
    The following patchset contains Netfilter updates for your net-next
    tree. Basically, improvements for the packet rejection infrastructure,
    deprecation of CLUSTERIP, cleanups for nf_tables and some untangling for
    br_netfilter. More specifically they are:
    
    1) Send packet to reset flow if checksum is valid, from Florian Westphal.
    
    2) Fix nf_tables reject bridge from the input chain, also from Florian.
    
    3) Deprecate the CLUSTERIP target, the cluster match supersedes it in
       functionality and it's known to have problems.
    
    4) A couple of cleanups for nf_tables rule tracing infrastructure, from
       Patrick McHardy.
    
    5) Another cleanup to place transaction declarations at the bottom of
       nf_tables.h, also from Patrick.
    
    6) Consolidate Kconfig dependencies wrt. NF_TABLES.
    
    7) Limit table names to 32 bytes in nf_tables.
    
    8) mac header copying in bridge netfilter is already required when
       calling ip_fragment(), from Florian Westphal.
    
    9) move nf_bridge_update_protocol() to br_netfilter.c, also from
       Florian.
    
    10) Small refactor in br_netfilter in the transmission path, again from
        Florian.
    
    11) Move br_nf_pre_routing_finish_bridge_slow() to br_netfilter.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    5428aef8
br_private.h 23.6 KB