From: Ben Pfaff <blp@nicira.com>
Date: Thu, 20 May 2010 22:43:13 +0000 (-0700)
Subject: ofproto: Fix byte order for OFP_VLAN_NONE to dl_vlan in struct flow.
X-Git-Tag: v1.1.0pre1~278
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7ac0f8dbf41c185e3e8d3cc9d033467575c99542;p=sliver-openvswitch.git

ofproto: Fix byte order for OFP_VLAN_NONE to dl_vlan in struct flow.

This is not a bug, since OFP_VLAN_NONE is all-1-bits, but it is still
best to get it correct.
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 050b4df1a..aaf4ad6ee 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2490,7 +2490,7 @@ do_xlate_actions(const union ofp_action *in, size_t n_in,
 
         case OFPAT_STRIP_VLAN:
             odp_actions_add(ctx->out, ODPAT_STRIP_VLAN);
-            ctx->flow.dl_vlan = OFP_VLAN_NONE;
+            ctx->flow.dl_vlan = htons(OFP_VLAN_NONE);
             ctx->flow.dl_vlan_pcp = 0;
             break;