aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2019-11-19 23:05:54 +0100
committerDavid S. Miller <davem@davemloft.net>2019-11-20 11:21:34 -0800
commita82055af595946aea461528e551e6ae064b3d560 (patch)
tree7866d9d2b20e13d403ee617dc2c5b1637a9158cb /include
parentnetfilter: nf_tables_offload: allow ethernet interface type only (diff)
downloadlinux-dev-a82055af595946aea461528e551e6ae064b3d560.tar.xz
linux-dev-a82055af595946aea461528e551e6ae064b3d560.zip
netfilter: nft_payload: add VLAN offload support
Match on ethertype and set up protocol dependency. Check for protocol dependency before accessing the tci field. Allow to match on the encapsulated ethertype too. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/flow_dissector.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index 1a0727d1acfa..f06b0239c32b 100644
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -48,9 +48,12 @@ struct flow_dissector_key_tags {
};
struct flow_dissector_key_vlan {
- u16 vlan_id:12,
- vlan_dei:1,
- vlan_priority:3;
+ union {
+ u16 vlan_id:12,
+ vlan_dei:1,
+ vlan_priority:3;
+ __be16 vlan_tci;
+ };
__be16 vlan_tpid;
};