diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2018-11-08 18:44:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-08 19:49:31 -0800 |
| commit | 9df46aefafa6dee81a27c2a9d8ba360abd8c5fe3 (patch) | |
| tree | f2d3fc7dd5fa9ce4d97af32546be5e1815b3658f /net/openvswitch/flow.c | |
| parent | f723a1a293deefa7f25b3833266fa7eb18d877f7 (diff) | |
| download | linux-9df46aefafa6dee81a27c2a9d8ba360abd8c5fe3.tar.gz linux-9df46aefafa6dee81a27c2a9d8ba360abd8c5fe3.tar.bz2 linux-9df46aefafa6dee81a27c2a9d8ba360abd8c5fe3.zip | |
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.c')
| -rw-r--r-- | net/openvswitch/flow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index 35966da84769..fa393815991e 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -325,7 +325,7 @@ static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh, return -ENOMEM; vh = (struct vlan_head *)skb->data; - key_vh->tci = vh->tci | htons(VLAN_TAG_PRESENT); + key_vh->tci = vh->tci | htons(VLAN_CFI_MASK); key_vh->tpid = vh->tpid; if (unlikely(untag_vlan)) { @@ -358,7 +358,7 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key) int res; if (skb_vlan_tag_present(skb)) { - key->eth.vlan.tci = htons(skb->vlan_tci); + key->eth.vlan.tci = htons(skb->vlan_tci) | htons(VLAN_CFI_MASK); key->eth.vlan.tpid = skb->vlan_proto; } else { /* Parse outer vlan tag in the non-accelerated case. */ |