summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJiri Benc <jbenc@redhat.com>2016-10-10 17:02:42 +0200
committerDavid S. Miller <davem@davemloft.net>2016-10-13 10:03:23 -0400
commit20ecf1e4e30005ad50f561a92c888b6477f99341 (patch)
tree91c4e41faf3267212cb9c04f5865b1e49c02d464 /net
parent88a2428b83db4328e69d1c0e2f7364041b8045bf (diff)
downloadlinux-stable-20ecf1e4e30005ad50f561a92c888b6477f99341.tar.gz
linux-stable-20ecf1e4e30005ad50f561a92c888b6477f99341.tar.bz2
linux-stable-20ecf1e4e30005ad50f561a92c888b6477f99341.zip
openvswitch: vlan: remove wrong likely statement
This code is called whenever flow key is being extracted from the packet. The packet may be as likely vlan tagged as not. Fixes: 018c1dda5ff1 ("openvswitch: 802.1AD Flow handling, actions, vlan parsing, netlink attributes") Signed-off-by: Jiri Benc <jbenc@redhat.com> Acked-by: Pravin B Shelar <pshelar@ovn.org> Acked-by: Eric Garver <e@erig.me> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/openvswitch/flow.c2
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 {