projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes
[cascardo/linux.git]
/
net
/
openvswitch
/
flow.c
diff --git
a/net/openvswitch/flow.c
b/net/openvswitch/flow.c
index
c8c82e1
..
2208706
100644
(file)
--- 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 {