[ovs-dev] [PATCH 18/26] ofproto-dpif-xlate: Remove multiple members from struct xlate_out.

Jarno Rajahalme jrajahalme at nicira.com
Fri Jul 31 21:30:18 UTC 2015


Must have been historical reasons :-)

Acked-by: Jarno Rajahalme <jrajahalme at nicira.com>

> On Jul 29, 2015, at 11:42 PM, Ben Pfaff <blp at nicira.com> wrote:
> 
> Nothing used them.
> 
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
> ofproto/ofproto-dpif-xlate.c | 7 -------
> ofproto/ofproto-dpif-xlate.h | 3 ---
> 2 files changed, 10 deletions(-)
> 
> diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
> index 2a91cfc..ac7ded7 100644
> --- a/ofproto/ofproto-dpif-xlate.c
> +++ b/ofproto/ofproto-dpif-xlate.c
> @@ -2260,8 +2260,6 @@ xlate_normal(struct xlate_ctx *ctx)
>     uint16_t vlan;
>     uint16_t vid;
> 
> -    ctx->xout->has_normal = true;
> -
>     memset(&wc->masks.dl_src, 0xff, sizeof wc->masks.dl_src);
>     memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst);
>     wc->masks.vlan_tci |= htons(VLAN_VID_MASK | VLAN_CFI);
> @@ -3835,7 +3833,6 @@ xlate_learn_action__(struct xlate_ctx *ctx, const struct ofpact_learn *learn,
> static void
> xlate_learn_action(struct xlate_ctx *ctx, const struct ofpact_learn *learn)
> {
> -    ctx->xout->has_learn = true;
>     learn_mask(learn, ctx->wc);
> 
>     if (ctx->xin->xcache) {
> @@ -4423,7 +4420,6 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len,
>         case OFPACT_FIN_TIMEOUT:
>             CHECK_MPLS_RECIRCULATION();
>             memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto);
> -            ctx->xout->has_fin_timeout = true;
>             xlate_fin_timeout(ctx, ofpact_get_FIN_TIMEOUT(a));
>             break;
> 
> @@ -4719,9 +4715,6 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout)
>     *xout = (struct xlate_out) {
>         .slow = 0,
>         .fail_open = false,
> -        .has_learn = false,
> -        .has_normal = false,
> -        .has_fin_timeout = false,
>         .nf_output_iface = NF_OUT_DROP,
>         .n_recircs = 0,
>     };
> diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h
> index 346c735..6dd990a 100644
> --- a/ofproto/ofproto-dpif-xlate.h
> +++ b/ofproto/ofproto-dpif-xlate.h
> @@ -40,9 +40,6 @@ struct xlate_cache;
> struct xlate_out {
>     enum slow_path_reason slow; /* 0 if fast path may be used. */
>     bool fail_open;             /* Initial rule is fail open? */
> -    bool has_learn;             /* Actions include NXAST_LEARN? */
> -    bool has_normal;            /* Actions output to OFPP_NORMAL? */
> -    bool has_fin_timeout;       /* Actions include NXAST_FIN_TIMEOUT? */
>     ofp_port_t nf_output_iface; /* Output interface index for NetFlow. */
> 
>     /* Recirculation IDs on which references are held. */
> -- 
> 2.1.3
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev




More information about the dev mailing list