From: Anupam Chanda <acha...@nicira.com>
Two instances of ofputil_flow_update had the priority field uninitialized.
This would cause flow updates to contain undefined priority values.
This bug was introduced by commit 81a76618 (classifier: Break cls_rule
'flow' and 'wc' members into new "struct match".)
Signed-off-by: Anupam Chanda <acha...@nicira.com>
Signed-off-by: Ben Pfaff <b...@nicira.com>
---
This patch came in out-of-band through private email. Normally I'd
ask for it to be re-sent to dev@openvswitch.org, but it was such an
obviously correct bug fix that I just applied it directly. Thus,
this is already on master.
AUTHORS | 1 +
ofproto/connmgr.c | 1 +
ofproto/ofproto.c | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 70257e5..1ed8676 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ Alexey I. Froloff ra...@altlinux.org
Andrew Evans aev...@nicira.com
Andrew Lambeth w...@nicira.com
Andy Southgate andy.southg...@citrix.com
+Anupam Chanda acha...@nicira.com
Arun Sharma arun.sha...@calsoftinc.com
Ben Pfaff b...@nicira.com
Brian Kruger bkruger+ovs...@gmail.com
diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
index 391995e..05e69c7 100644
--- a/ofproto/connmgr.c
+++ b/ofproto/connmgr.c
@@ -1815,6 +1815,7 @@ ofmonitor_report(struct connmgr *mgr, struct rule *rule,
fu.cookie = rule->flow_cookie;
minimatch_expand(&rule->cr.match, &match);
fu.match = &match;
+ fu.priority = rule->cr.priority;
if (flags & NXFMF_ACTIONS) {
fu.ofpacts = rule->ofpacts;
fu.ofpacts_len = rule->ofpacts_len;
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 47cf22b..e3b24c1 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -3550,6 +3550,7 @@ ofproto_compose_flow_refresh_update(const struct rule
*rule,
fu.cookie = rule->flow_cookie;
minimatch_expand(&rule->cr.match, &match);
fu.match = &match;
+ fu.priority = rule->cr.priority;
if (!(flags & NXFMF_ACTIONS)) {
fu.ofpacts = NULL;
fu.ofpacts_len = 0;
--
1.7.2.5
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
