X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=b41110dbcb3fd978db959f3104a48a7cc972869e;hb=093ca5b366899cb187ac0fb70b9308eeb8f452eb;hp=9eeb28cd1d12c04be4253c94e1f575ea6f52535e;hpb=c31abb566dabe942ab2b530409dc807936839b63;p=sliver-openvswitch.git

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 9eeb28cd1..b41110dbc 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -904,7 +904,6 @@ static int validate_actions(const struct sw_flow_actions *actions)
 
 	for (i = 0; i < actions->n_actions; i++) {
 		const union odp_action *a = &actions->actions[i];
-		__be16 mask;
 
 		switch (a->type) {
 		case ODPAT_CONTROLLER:
@@ -928,12 +927,7 @@ static int validate_actions(const struct sw_flow_actions *actions)
 			break;
 
 		case ODPAT_SET_DL_TCI:
-			mask = a->dl_tci.mask;
-			if (mask != htons(VLAN_VID_MASK) &&
-			    mask != htons(VLAN_PCP_MASK) &&
-			    mask != htons(VLAN_VID_MASK | VLAN_PCP_MASK))
-				return -EINVAL;
-			if (a->dl_tci.tci & ~mask)
+			if (a->dl_tci.tci & htons(VLAN_CFI_MASK))
 				return -EINVAL;
 			break;