summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-07-06 10:36:00 -0700
committerBen Pfaff <blp@nicira.com>2012-07-12 14:12:59 -0700
commit41792464296d4ea9393adff3eea7bef514655cba (patch)
tree568b45f2e5cd7a27f908cdd5845c86b76d27d882
parenta644168568471eb33f8d1e60e872859f4e5bbc69 (diff)
downloadopenvswitch-41792464296d4ea9393adff3eea7bef514655cba.tar.gz
ofproto: Revert change in flow cookie when an ofoperation fails.
The flow_cookie member of struct ofoperation has always been there, but it seems that it's never been used. This fixes the code so that if a modify operation fails the rule's original flow cookie is restored. Signed-off-by: Ben Pfaff <blp@nicira.com>
-rw-r--r--ofproto/ofproto.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index dfa83e56e..66e8bb86c 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -3650,6 +3650,7 @@ ofopgroup_complete(struct ofopgroup *group)
if (!op->error) {
rule->modified = time_msec();
} else {
+ rule->flow_cookie = op->flow_cookie;
free(rule->ofpacts);
rule->ofpacts = op->ofpacts;
rule->ofpacts_len = op->ofpacts_len;