diff options
| author | Petr Machata <petrm@mellanox.com> | 2019-11-22 16:47:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-22 18:44:14 +0100 |
| commit | d1746d1e80a86ca86b0c2680510898d411d2ef47 (patch) | |
| tree | 0e059462312ad4d8050a3489fcccd513cf986743 /include/net/flow_dissector.h | |
| parent | Merge tag 'mac80211-next-for-net-next-2019-11-22' of git://git.kernel.org/pub... (diff) | |
| download | linux-d1746d1e80a86ca86b0c2680510898d411d2ef47.tar.xz linux-d1746d1e80a86ca86b0c2680510898d411d2ef47.zip | |
net: flow_dissector: Wrap unionized VLAN fields in a struct
In commit a82055af5959 ("netfilter: nft_payload: add VLAN offload
support"), VLAN fields in struct flow_dissector_key_vlan were unionized
with the intention of introducing another field that covered the whole TCI
header. However without a wrapping struct the subfields end up sharing the
same bits. As a result, "tc filter add ... flower vlan_id 14" specifies not
only vlan_id, but also vlan_priority.
Fix by wrapping the individual VLAN fields in a struct.
Fixes: a82055af5959 ("netfilter: nft_payload: add VLAN offload support")
Signed-off-by: Petr Machata <petrm@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/flow_dissector.h')
| -rw-r--r-- | include/net/flow_dissector.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h index f06b0239c32b..b8c20e9f343e 100644 --- a/include/net/flow_dissector.h +++ b/include/net/flow_dissector.h @@ -49,9 +49,11 @@ struct flow_dissector_key_tags { struct flow_dissector_key_vlan { union { - u16 vlan_id:12, - vlan_dei:1, - vlan_priority:3; + struct { + u16 vlan_id:12, + vlan_dei:1, + vlan_priority:3; + }; __be16 vlan_tci; }; __be16 vlan_tpid; |