[ovs-dev] [PATCH] ofproto-dpif-xlate: Don't save pkt_mark in compose_output_action__().

Ben Pfaff blp at ovn.org
Wed Mar 29 18:16:55 UTC 2017


Thanks, applied to master.

On Fri, Mar 17, 2017 at 11:07:30AM -0700, Jarno Rajahalme wrote:
> Acked-by: Jarno Rajahalme <jarno at ovn.org>
> 
> > On Mar 17, 2017, at 10:55 AM, Ben Pfaff <blp at ovn.org> wrote:
> > 
> > Previously, this function could modify the pkt_mark field as part of IPsec
> > integration.  It no longer does that, so there's no longer any need for it
> > to save and restore pkt_mark, and this commit removes that.
> > 
> > CC: Ansis Atteka <aatteka at ovn.org>
> > Signed-off-by: Ben Pfaff <blp at ovn.org>
> > ---
> > ofproto/ofproto-dpif-xlate.c | 3 ---
> > 1 file changed, 3 deletions(-)
> > 
> > diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
> > index 1a82b8d569be..9fe778a32857 100644
> > --- a/ofproto/ofproto-dpif-xlate.c
> > +++ b/ofproto/ofproto-dpif-xlate.c
> > @@ -3265,7 +3265,6 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port,
> >     struct flow *flow = &ctx->xin->flow;
> >     struct flow_tnl flow_tnl;
> >     union flow_vlan_hdr flow_vlans[FLOW_MAX_VLAN_HEADERS];
> > -    uint32_t flow_pkt_mark;
> >     uint8_t flow_nw_tos;
> >     odp_port_t out_port, odp_port;
> >     bool tnl_push_pop_send = false;
> > @@ -3460,7 +3459,6 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port,
> >     }
> > 
> >     memcpy(flow_vlans, flow->vlans, sizeof flow_vlans);
> > -    flow_pkt_mark = flow->pkt_mark;
> >     flow_nw_tos = flow->nw_tos;
> > 
> >     if (count_skb_priorities(xport)) {
> > @@ -3588,7 +3586,6 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port,
> >  out:
> >     /* Restore flow */
> >     memcpy(flow->vlans, flow_vlans, sizeof flow->vlans);
> > -    flow->pkt_mark = flow_pkt_mark;
> >     flow->nw_tos = flow_nw_tos;
> > }
> > 
> > -- 
> > 2.10.2
> > 
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> 


More information about the dev mailing list