From: Ben Pfaff <blp@nicira.com>
Date: Mon, 15 Nov 2010 22:53:23 +0000 (-0800)
Subject: ofproto: Always set VLAN_CFI bit to 0 in ODPAT_SET_DL_TCI action.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=796d0648c1f9da07b758211b78528eaa5fa3c32d;p=openvswitch

ofproto: Always set VLAN_CFI bit to 0 in ODPAT_SET_DL_TCI action.

The kernel requires VLAN_CFI to be 0, not 1.

Reported-by: Teemu Koponen <koponen@nicira.com>
Tested-by: Teemu Koponen <koponen@nicira.com>
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index aec0f8fa..6b071c7d 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2795,8 +2795,7 @@ xlate_set_dl_tci(struct action_xlate_ctx *ctx)
     } else {
         union odp_action *oa = odp_actions_add(ctx->out, ODPAT_SET_DL_TCI);
         oa->dl_tci.tci = htons(ntohs(dl_vlan & htons(VLAN_VID_MASK))
-                               | (dl_vlan_pcp << VLAN_PCP_SHIFT)
-                               | VLAN_CFI);
+                               | (dl_vlan_pcp << VLAN_PCP_SHIFT));
     }
 }