netfilter: nf_tables_offload: skip VLAN handling if FLOW_DISSECTOR_KEY_CONTROL is unset
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables_offload: skip VLAN handling if FLOW_DISSECTOR_KEY_CONTROL is unset
Restore hardware offload support for rules that provide no matching ethertype through FLOW_DISSECTOR_KEY_CONTROL.
Fixes 783003f3bb8a ("netfilter: nftables_offload: special ethertype handling for VLAN")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_tables_offload.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/netfilter/nf_tables_offload.c +4 -2
@@ -56,8 +56,10 @@ static void nft_flow_rule_transfer_vlan(struct nft_offload_ctx *ctx,struct nft_flow_match *match = &flow->match;struct nft_offload_ethertype ethertype; -if (match->dissector.used_keys &BIT (FLOW_DISSECTOR_KEY_CONTROL ) && - match->key.basic.n_proto !=htons (ETH_P_8021Q ) && +if (!(match->dissector.used_keys &BIT (FLOW_DISSECTOR_KEY_CONTROL ))) +return ; + +if (match->key.basic.n_proto !=htons (ETH_P_8021Q ) && match->key.basic.n_proto !=htons (ETH_P_8021AD ))return ;
Signature · 1 line
2.30.2