Thanks for the quick review. I pushed this to master and branch-1.11.
--Justin
On Jun 11, 2013, at 11:03 PM, Ethan Jackson <et...@nicira.com> wrote:
> Acked-by: Ethan Jackson <et...@nicira.com>
>
> On Tue, Jun 11, 2013 at 11:00 PM, Justin Pettit <jpet...@nicira.com> wrote:
>> The handle_flow_miss_with_facet() function used the facet's flow
>> information instead of the missed flow. This corrects that.
>>
>> Signed-off-by: Justin Pettit <jpet...@nicira.com>
>> ---
>> ofproto/ofproto-dpif.c | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
>> index 74a6ead..c0f6df0 100644
>> --- a/ofproto/ofproto-dpif.c
>> +++ b/ofproto/ofproto-dpif.c
>> @@ -3788,7 +3788,7 @@ handle_flow_miss_with_facet(struct flow_miss *miss,
>> struct facet *facet,
>> if (want_path != SF_FAST_PATH) {
>> struct xlate_in xin;
>>
>> - xlate_in_init(&xin, ofproto, &facet->flow, facet->rule, 0,
>> packet);
>> + xlate_in_init(&xin, ofproto, &miss->flow, facet->rule, 0,
>> packet);
>> xlate_actions_for_side_effects(&xin);
>> }
>>
>> @@ -3817,7 +3817,7 @@ handle_flow_miss_with_facet(struct flow_miss *miss,
>> struct facet *facet,
>> put->actions = facet->xout.odp_actions.data;
>> put->actions_len = facet->xout.odp_actions.size;
>> } else {
>> - compose_slow_path(ofproto, &facet->flow, facet->xout.slow,
>> + compose_slow_path(ofproto, &miss->flow, facet->xout.slow,
>> op->slow_stub, sizeof op->slow_stub,
>> &put->actions, &put->actions_len);
>> }
>> --
>> 1.7.5.4
>>
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
