From 2f2df2f4dafada02f022c2900f7a17628af7a0d1 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 12 Sep 2011 10:49:55 -0700 Subject: [PATCH] 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 --- ofproto/ofproto-dpif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index 3074881e..c632df64 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, -- 2.30.2