From: Ben Pfaff <blp@nicira.com>
Date: Mon, 12 Sep 2011 17:49:55 +0000 (-0700)
Subject: ofproto-dpif: Fix check for 802.1Q header in commit_odp_actions().
X-Git-Tag: v1.3.0~327
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2f2df2f4dafada02f022c2900f7a17628af7a0d1;p=sliver-openvswitch.git

ofproto-dpif: Fix check for 802.1Q header in commit_odp_actions().

The 'vlan_tci' member of struct flow has value 0, not OFP_VLAN_NONE, when
there is no 802.1Q header.

Fixes a problem introduced in commit d9065a90b6b "datapath: VLAN actions
should use push/pop semantics."

Found by sparse.

CC: Pravin Shelar <pshelar@nicira.com>
---

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 3074881ea..c632df64c 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -2859,7 +2859,7 @@ commit_odp_actions(struct action_xlate_ctx *ctx)
         if (!(flow->vlan_tci & htons(VLAN_CFI))) {
             nl_msg_put_flag(odp_actions, OVS_ACTION_ATTR_POP_VLAN);
         } else {
-            if (base->vlan_tci != OFP_VLAN_NONE) {
+            if (base->vlan_tci != htons(0)) {
                 nl_msg_put_flag(odp_actions, OVS_ACTION_ATTR_POP_VLAN);
             }
             nl_msg_put_be16(odp_actions, OVS_ACTION_ATTR_PUSH_VLAN,