OSDN Git Service

Merge branch 'nf_tables_offload-vlan-matching-support'
authorDavid S. Miller <davem@davemloft.net>
Wed, 20 Nov 2019 19:21:35 +0000 (11:21 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Nov 2019 19:21:35 +0000 (11:21 -0800)
Pablo Neira Ayuso says:

====================
nf_tables_offload: vlan matching support

The following patchset contains Netfilter support for vlan matching
offloads:

1) Constify nft_reg_load() as a preparation patch.
2) Restrict rule matching to ingress interface type ARPHRD_ETHER.
3) Add new vlan_tci field to flow_dissector_key_vlan structure,
   to allow to set up vlan_id, vlan_dei and vlan_priority in one go.
4) C-VLAN matching support.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge