• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · ee895a30
    David S. Miller authored
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter fixes for net
    
    The following patchset contains Netfilter fixes for net:
    
    1) Flush the cleanup xtables worker to make sure destructors
       have completed, from Florian Westphal.
    
    2) iifgroup is matching erroneously, also from Florian.
    
    3) Add selftest for meta interface matching, from Florian Westphal.
    
    4) Move nf_ct_offload_timeout() to header, from Roi Dayan.
    
    5) Call nf_ct_offload_timeout() from flow_offload_add() to
       make sure garbage collection does not evict offloaded flow,
       from Roi Dayan.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    ee895a30
nf_conntrack_core.c 71 KB