diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-13 10:03:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-13 10:03:24 -0400 |
| commit | 4013bee5f0041cb24da0673bcbfbf2d4dd19aa4e (patch) | |
| tree | a3f7fb73423abdb3423575b1021bf1cc21647ef1 /net/openvswitch/flow.c | |
| parent | 88a2428b83db4328e69d1c0e2f7364041b8045bf (diff) | |
| parent | 3145c037e74926dea9241a3f68ada6f294b0119a (diff) | |
Merge branch 'ovs-8021AD-fixes'
Jiri Benc says:
====================
openvswitch: vlan fixes
Fix three issues introduced by the 802.1AD patchset.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/flow.c')
| -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 c8c82e109c68..22087062bd10 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -343,7 +343,7 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key) key->eth.cvlan.tci = 0; key->eth.cvlan.tpid = 0; - if (likely(skb_vlan_tag_present(skb))) { + if (skb_vlan_tag_present(skb)) { key->eth.vlan.tci = htons(skb->vlan_tci); key->eth.vlan.tpid = skb->vlan_proto; } else { |