projects
/
cascardo
/
ovs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a7fb94e
)
Datapath: Bug fix: kernel rejects mega flow with encap masks
author
Andy Zhou
<azhou@nicira.com>
Wed, 26 Jun 2013 15:54:44 +0000
(08:54 -0700)
committer
Jesse Gross
<jesse@nicira.com>
Fri, 28 Jun 2013 02:11:59 +0000
(19:11 -0700)
Bug #18233
Signed-off-by: Andy Zhou <azhou@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
datapath/flow.c
patch
|
blob
|
history
diff --git
a/datapath/flow.c
b/datapath/flow.c
index
2801cbb
..
99c4984
100644
(file)
--- 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)) {