| Message ID | 3a3f096a59e139d4149ef57d247639286bba9593.1541875851.git.mirq-linux@rere.qmqm.pl |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] OVS: remove VLAN_TAG_PRESENT - fixup | expand |
From: Michał Mirosław <mirq-linux@rere.qmqm.pl> Date: Sat, 10 Nov 2018 19:55:34 +0100 > 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> Applied, thanks.
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;
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> --- net/openvswitch/flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)