X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.c;h=778771f2ab83aa139d52641eddbdae65e78f6a10;hb=063236f117caca6ef7d246df3d0bff53d12fa8e7;hp=fc6752e39e29664eebc22892bb662747b534c762;hpb=4222bbc86cf229938c3d535a26311470c7bee9d2;p=sliver-openvswitch.git

diff --git a/datapath/flow.c b/datapath/flow.c
index fc6752e39..778771f2a 100644
--- a/datapath/flow.c
+++ b/datapath/flow.c
@@ -1558,6 +1558,7 @@ int ovs_match_from_nlattrs(struct sw_flow_match *match,
 		if ((mask_attrs & 1ULL << OVS_KEY_ATTR_ENCAP) && encap_valid) {
 			__be16 eth_type = 0;
 
+			mask_attrs &= ~(1ULL << OVS_KEY_ATTR_ENCAP);
 			if (a[OVS_KEY_ATTR_ETHERTYPE])
 				eth_type = nla_get_be16(a[OVS_KEY_ATTR_ETHERTYPE]);
 			if (eth_type == htons(0xffff)) {