From: Ben Pfaff <blp@nicira.com>
Date: Tue, 20 Mar 2012 18:32:08 +0000 (-0700)
Subject: learn: Initialize cookie_mask in constructed flow_mod.
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ccd3cf44eb28dc109f07cf329a8bda7146821355;p=sliver-openvswitch.git

learn: Initialize cookie_mask in constructed flow_mod.

Otherwise the "learn" action may not correctly set the cookie in flows that
it creates.

Found by valgrind.

Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/learn.c b/lib/learn.c
index 9d97cb35c..284a6cdda 100644
--- a/lib/learn.c
+++ b/lib/learn.c
@@ -190,6 +190,7 @@ learn_execute(const struct nx_action_learn *learn, const struct flow *flow,
 
     cls_rule_init_catchall(&fm->cr, ntohs(learn->priority));
     fm->cookie = learn->cookie;
+    fm->cookie_mask = htonll(UINT64_MAX);
     fm->table_id = learn->table_id;
     fm->command = OFPFC_MODIFY_STRICT;
     fm->idle_timeout = ntohs(learn->idle_timeout);