>
> orig_tunnel_ip_dst is not used in 1.11 yet, so it should be deleted from this 
> patch.
> There is only one use of it later in the patch, which should also be removed.
> ...

That's why I wanted someone to peek at it =).  Thanks Jarno, I'll delete it.

Ethan

>>
>> -
>> -/* Translates the 'ofpacts_len' bytes of "struct ofpacts" starting at 
>> 'ofpacts'
>> - * into datapath actions in 'odp_actions', using 'ctx'. */
>> -static void
>> -xlate_actions(struct xlate_ctx *ctx,
>> -              const struct ofpact *ofpacts, size_t ofpacts_len,
>> -              struct ofpbuf *odp_actions)
>> -{
>> -    /* Normally false.  Set to true if we ever hit MAX_RESUBMIT_RECURSION, 
>> so
>> -     * that in the future we always keep a copy of the original flow for
>> -     * tracing purposes. */
>> -    static bool hit_resubmit_limit;
>> -
>> -    enum slow_path_reason special;
>> -    struct ofport_dpif *in_port;
>> -    struct flow orig_flow;
>> +    ctx.xin = xin;
>> +    ctx.xout = xout;
>> +
>> +    ctx.ofproto = xin->ofproto;
>> +    ctx.rule = xin->rule;
>> +
>> +    ctx.base_flow = ctx.xin->flow;
>> +    memset(&ctx.base_flow.tunnel, 0, sizeof ctx.base_flow.tunnel);
>> +    ctx.base_flow.vlan_tci = xin->initial_vals.vlan_tci;
>> +    ctx.base_flow.tunnel.ip_tos = xin->initial_vals.tunnel_ip_tos;
>> +    ctx.orig_tunnel_ip_dst = ctx.xin->flow.tunnel.ip_dst;
>> +
>
> Here.
>
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

Reply via email to