From: Andy Zhou <azhou@nicira.com>
Date: Wed, 26 Jun 2013 15:54:44 +0000 (-0700)
Subject: Datapath: Bug fix: kernel rejects mega flow with encap masks
X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~24
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=063236f117caca6ef7d246df3d0bff53d12fa8e7

Datapath: Bug fix: kernel rejects mega flow with encap masks

Bug #18233

Signed-off-by: Andy Zhou <azhou@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---

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)) {