From: Jiri Benc <jbenc@redhat.com>
To: netdev@vger.kernel.org
Cc: pravin shelar <pshelar@ovn.org>, Eric Garver <e@erig.me>
Subject: [PATCH net 1/3] openvswitch: vlan: remove wrong likely statement
Date: Mon, 10 Oct 2016 17:02:42 +0200 [thread overview]
Message-ID: <a4b63fa787569359d227beecbdbf9b023081cffc.1476111550.git.jbenc@redhat.com> (raw)
In-Reply-To: <cover.1476111550.git.jbenc@redhat.com>
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>
---
net/openvswitch/flow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 {
--
1.8.3.1
next prev parent reply other threads:[~2016-10-10 15:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-10 15:02 [PATCH net 0/3] openvswitch: vlan fixes Jiri Benc
2016-10-10 15:02 ` Jiri Benc [this message]
2016-10-10 20:05 ` [PATCH net 1/3] openvswitch: vlan: remove wrong likely statement Pravin Shelar
2016-10-11 17:38 ` Eric Garver
2016-10-10 15:02 ` [PATCH net 2/3] openvswitch: fix vlan subtraction from packet length Jiri Benc
2016-10-10 20:05 ` Pravin Shelar
2016-10-11 17:41 ` Eric Garver
2016-10-10 15:02 ` [PATCH net 3/3] openvswitch: add NETIF_F_HW_VLAN_STAG_TX to internal dev Jiri Benc
2016-10-10 20:05 ` Pravin Shelar
2016-10-11 17:41 ` Eric Garver
2016-10-13 14:03 ` [PATCH net 0/3] openvswitch: vlan fixes David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a4b63fa787569359d227beecbdbf9b023081cffc.1476111550.git.jbenc@redhat.com \
--to=jbenc@redhat.com \
--cc=e@erig.me \
--cc=netdev@vger.kernel.org \
--cc=pshelar@ovn.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.