X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=74ac87efa1d85c81b98778c4a1a3699c09719fab;hb=26233bb4615608fd45d89a5abe2e62f4b3d776f7;hp=73481ddd6da5bd4f01e27d423dfbda8ce4e142ce;hpb=ae412e7dd89489911a32c6723d4109c6d1de3a38;p=sliver-openvswitch.git diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 73481ddd6..74ac87efa 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -2312,8 +2312,9 @@ compose_actions(struct bridge *br, const struct flow *flow, uint16_t vlan, if (p->vlan == OFP_VLAN_NONE) { odp_actions_add(actions, ODPAT_STRIP_VLAN); } else { - a = odp_actions_add(actions, ODPAT_SET_VLAN_VID); - a->vlan_vid.vlan_vid = htons(p->vlan); + a = odp_actions_add(actions, ODPAT_SET_DL_TCI); + a->dl_tci.tci = htons(p->vlan & VLAN_VID_MASK); + a->dl_tci.mask = htons(VLAN_VID_MASK); } cur_vlan = p->vlan; }