ofproto: Always set VLAN_CFI bit to 0 in ODPAT_SET_DL_TCI action.
authorBen Pfaff <blp@nicira.com>
Mon, 15 Nov 2010 22:53:23 +0000 (14:53 -0800)
committerBen Pfaff <blp@nicira.com>
Mon, 15 Nov 2010 22:53:23 +0000 (14:53 -0800)
The kernel requires VLAN_CFI to be 0, not 1.

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

index aec0f8fa191f90fabae78f05f7005559775f952c..6b071c7d934ecb0ac0f8beb089f1be0c76bcf2ee 100644 (file)
@@ -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));
     }
 }