Acked-by: Jarno Rajahalme <jrajaha...@nicira.com>
> On Jul 29, 2015, at 11:42 PM, Ben Pfaff <b...@nicira.com> wrote:
>
> This variable was only used as a temporary within a small scope, so it
> worked just as well to just use ctx.rule there instead.
>
> Signed-off-by: Ben Pfaff <b...@nicira.com>
> ---
> ofproto/ofproto-dpif-xlate.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
> index e39e46f..1ecc1e8 100644
> --- a/ofproto/ofproto-dpif-xlate.c
> +++ b/ofproto/ofproto-dpif-xlate.c
> @@ -4738,7 +4738,6 @@ xlate_actions(struct xlate_in *xin, struct xlate_out
> *xout)
> }
>
> struct flow *flow = &xin->flow;
> - struct rule_dpif *rule = NULL;
>
> union mf_subvalue stack_stub[1024 / sizeof(union mf_subvalue)];
> uint64_t action_set_stub[1024 / 8];
> @@ -4907,25 +4906,22 @@ xlate_actions(struct xlate_in *xin, struct xlate_out
> *xout)
> ctx.tables_version =
> ofproto_dpif_get_tables_version(ctx.xbridge->ofproto);
>
> if (!xin->ofpacts && !ctx.rule) {
> - rule = rule_dpif_lookup_from_table(ctx.xbridge->ofproto,
> - ctx.tables_version, flow, xin->wc,
> - ctx.xin->xcache != NULL,
> - ctx.xin->resubmit_stats,
> - &ctx.table_id,
> - flow->in_port.ofp_port, true,
> true);
> + ctx.rule = rule_dpif_lookup_from_table(
> + ctx.xbridge->ofproto, ctx.tables_version, flow, xin->wc,
> + ctx.xin->xcache != NULL, ctx.xin->resubmit_stats, &ctx.table_id,
> + flow->in_port.ofp_port, true, true);
> if (ctx.xin->resubmit_stats) {
> - rule_dpif_credit_stats(rule, ctx.xin->resubmit_stats);
> + rule_dpif_credit_stats(ctx.rule, ctx.xin->resubmit_stats);
> }
> if (ctx.xin->xcache) {
> struct xc_entry *entry;
>
> entry = xlate_cache_add_entry(ctx.xin->xcache, XC_RULE);
> - entry->u.rule = rule;
> + entry->u.rule = ctx.rule;
> }
> - ctx.rule = rule;
>
> if (OVS_UNLIKELY(ctx.xin->resubmit_hook)) {
> - ctx.xin->resubmit_hook(ctx.xin, rule, 0);
> + ctx.xin->resubmit_hook(ctx.xin, ctx.rule, 0);
> }
> }
> xout->fail_open = ctx.rule && rule_dpif_is_fail_open(ctx.rule);
> --
> 2.1.3
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
