diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2018-11-08 12:44:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-11-08 22:49:31 -0500 |
commit | 9df46aefafa6dee81a27c2a9d8ba360abd8c5fe3 (patch) | |
tree | f2d3fc7dd5fa9ce4d97af32546be5e1815b3658f /net/openvswitch/flow.h | |
parent | f723a1a293deefa7f25b3833266fa7eb18d877f7 (diff) |
OVS: remove use of VLAN_TAG_PRESENT
This is a minimal change to allow removing of VLAN_TAG_PRESENT.
It leaves OVS unable to use CFI bit, as fixing this would need
a deeper surgery involving userspace interface.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow.h')
-rw-r--r-- | net/openvswitch/flow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h index c670dd24b8b7..ba01fc4270bd 100644 --- a/net/openvswitch/flow.h +++ b/net/openvswitch/flow.h | |||
@@ -60,7 +60,7 @@ struct ovs_tunnel_info { | |||
60 | 60 | ||
61 | struct vlan_head { | 61 | struct vlan_head { |
62 | __be16 tpid; /* Vlan type. Generally 802.1q or 802.1ad.*/ | 62 | __be16 tpid; /* Vlan type. Generally 802.1q or 802.1ad.*/ |
63 | __be16 tci; /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */ | 63 | __be16 tci; /* 0 if no VLAN, VLAN_CFI_MASK set otherwise. */ |
64 | }; | 64 | }; |
65 | 65 | ||
66 | #define OVS_SW_FLOW_KEY_METADATA_SIZE \ | 66 | #define OVS_SW_FLOW_KEY_METADATA_SIZE \ |