diff options
| author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2018-11-10 19:55:34 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-10 22:42:16 +0100 |
| commit | 6083e28aa02d7c9e6b87f8b944e92793094ae047 (patch) | |
| tree | 779e69d2e6039d22d73a4e2d0fe64bf47b90ad63 | |
| parent | infiniband: nes: Fix more direct skb list accesses. (diff) | |
| download | linux-6083e28aa02d7c9e6b87f8b944e92793094ae047.tar.xz linux-6083e28aa02d7c9e6b87f8b944e92793094ae047.zip | |
OVS: remove VLAN_TAG_PRESENT - fixup
It turns out I missed one VLAN_TAG_PRESENT in OVS code while rebasing.
This fixes it.
Fixes: 9df46aefafa6 ("OVS: remove use of VLAN_TAG_PRESENT")
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/openvswitch/flow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index fa393815991e..57e07768c9d1 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -597,7 +597,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) * skb_vlan_pop(), which will later shift the ethertype into * skb->protocol. */ - if (key->eth.cvlan.tci & htons(VLAN_TAG_PRESENT)) + if (key->eth.cvlan.tci & htons(VLAN_CFI_MASK)) skb->protocol = key->eth.cvlan.tpid; else skb->protocol = key->eth.type; |