projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Fix init script typos that prevented turning brcompatd back on.
[openvswitch]
/
ofproto
/
ofproto.c
diff --git
a/ofproto/ofproto.c
b/ofproto/ofproto.c
index fcc76d6cbfee19f9b75d6e1d30f9fccdd3e9ea7d..9efc96eb708a70ed9fb584c9cb91ee2edacdaab0 100644
(file)
--- a/
ofproto/ofproto.c
+++ b/
ofproto/ofproto.c
@@
-2929,6
+2929,7
@@
modify_flow(struct ofproto *p, const struct ofp_flow_mod *ofm,
} else {
size_t actions_len = n_actions * sizeof *rule->actions;
} else {
size_t actions_len = n_actions * sizeof *rule->actions;
+ rule->flow_cookie = ofm->cookie;
if (n_actions == rule->n_actions
&& !memcmp(ofm->actions, rule->actions, actions_len))
{
if (n_actions == rule->n_actions
&& !memcmp(ofm->actions, rule->actions, actions_len))
{
@@
-2938,7
+2939,6
@@
modify_flow(struct ofproto *p, const struct ofp_flow_mod *ofm,
free(rule->actions);
rule->actions = xmemdup(ofm->actions, actions_len);
rule->n_actions = n_actions;
free(rule->actions);
rule->actions = xmemdup(ofm->actions, actions_len);
rule->n_actions = n_actions;
- rule->flow_cookie = ofm->cookie;
if (rule->cr.wc.wildcards) {
COVERAGE_INC(ofproto_mod_wc_flow);
if (rule->cr.wc.wildcards) {
COVERAGE_INC(ofproto_mod_wc_flow);