diff options
| author | Andy Zhou <azhou@nicira.com> | 2013-06-26 08:54:44 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-06-27 19:11:59 -0700 |
| commit | 56f5fcb26bd49fd6ded38c8164d8cbf6add65052 (patch) | |
| tree | bd021a2fceac5389eb9a6ba182797c7986eb2108 | |
| parent | a7fb94e3e7582fba9f3d8137eca43f299f9892be (diff) | |
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>
| -rw-r--r-- | datapath/flow.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/datapath/flow.c b/datapath/flow.c index 2801cbbb7..99c4984b7 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -1556,6 +1556,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)) { |