From: Alex Wang <alexw@nicira.com>
Date: Thu, 9 Jan 2014 00:52:12 +0000 (-0800)
Subject: ofproto/trace: Use final flow to compute "Relevant fields".
X-Git-Tag: sliver-openvswitch-2.1.90-1~10^2~49
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=b6befc6b064974063a31eda6f1cb4d0d466eb6f2

ofproto/trace: Use final flow to compute "Relevant fields".

Commit bcd2633a (ofproto-dpif: Store relevant fields for wildcarding
in facet.) introduced the bug that uses original input flow as final
flow to compute the "Relevant fields" in ofproto/trace ouput.  This
commit fixes this bug.

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

diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index a3fd792d1..03f784086 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -3870,7 +3870,7 @@ ofproto_trace(struct ofproto_dpif *ofproto, const struct flow *flow,
         ds_put_char(ds, '\n');
         trace_format_flow(ds, 0, "Final flow", &trace);
 
-        match_init(&match, flow, &trace.xout.wc);
+        match_init(&match, &trace.flow, &trace.xout.wc);
         ds_put_cstr(ds, "Relevant fields: ");
         match_format(&match, ds, OFP_DEFAULT_PRIORITY);
         ds_put_char(ds, '\n');