Skip to content
  • David S. Miller's avatar
    6dd06ec7
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 6dd06ec7
    David S. Miller authored
    
    
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter updates for net-next
    
    The following patchset contains Netfilter updates for net-next:
    
    1) Add vlan match and pop actions to the flowtable offload,
       patches from wenxu.
    
    2) Reduce size of the netns_ct structure, which itself is
       embedded in struct net Make netns_ct a read-mostly structure.
       Patches from Florian Westphal.
    
    3) Add FLOW_OFFLOAD_XMIT_UNSPEC to skip dst check from garbage
       collector path, as required by the tc CT action. From Roi Dayan.
    
    4) VLAN offload fixes for nftables: Allow for matching on both s-vlan
       and c-vlan selectors. Fix match of VLAN id due to incorrect
       byteorder. Add a new routine to properly populate flow dissector
       ethertypes.
    
    5) Missing keys in ip{6}_route_me_harder() results in incorrect
       routes. This includes an update for selftest infra. Patches
       from Ido Schimmel.
    
    6) Add counter hardware offload support through FLOW_CLS_STATS.
    ====================
    
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    6dd06ec7
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
    David S. Miller authored
    
    
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter updates for net-next
    
    The following patchset contains Netfilter updates for net-next:
    
    1) Add vlan match and pop actions to the flowtable offload,
       patches from wenxu.
    
    2) Reduce size of the netns_ct structure, which itself is
       embedded in struct net Make netns_ct a read-mostly structure.
       Patches from Florian Westphal.
    
    3) Add FLOW_OFFLOAD_XMIT_UNSPEC to skip dst check from garbage
       collector path, as required by the tc CT action. From Roi Dayan.
    
    4) VLAN offload fixes for nftables: Allow for matching on both s-vlan
       and c-vlan selectors. Fix match of VLAN id due to incorrect
       byteorder. Add a new routine to properly populate flow dissector
       ethertypes.
    
    5) Missing keys in ip{6}_route_me_harder() results in incorrect
       routes. This includes an update for selftest infra. Patches
       from Ido Schimmel.
    
    6) Add counter hardware offload support through FLOW_CLS_STATS.
    ====================
    
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Loading