X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=5904c8312d4116464bb3c528f4d28c154e1acdf0;hb=f74055e705bc9735853e11170b42840977279fb4;hp=5365278ab8266cf4b49a383a887745b9e8a2f0a1;hpb=7956695a6c2f8fb3b69888f72a720c25af75e23b;p=openvswitch

diff --git a/datapath/actions.c b/datapath/actions.c
index 5365278a..5904c831 100644
--- a/datapath/actions.c
+++ b/datapath/actions.c
@@ -74,7 +74,6 @@ static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 				       const struct odp_flow_key *key,
 				       const union odp_action *a, int n_actions)
 {
-	__be16 mask = a->dl_tci.mask;
 	__be16 tci = a->dl_tci.tci;
 
 	skb = make_writable(skb, VLAN_HLEN);
@@ -92,7 +91,7 @@ static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb,
 		vh = vlan_eth_hdr(skb);
 		old_tci = vh->h_vlan_TCI;
 
-		vh->h_vlan_TCI = (vh->h_vlan_TCI & ~mask) | tci;
+		vh->h_vlan_TCI = tci;
 
 		if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE) {
 			__be16 diff[] = { ~old_tci, vh->h_vlan_TCI };