[ovs-dev] [PATCH] dpif-netdev: Remove unnecessary parameters from dp_netdev_execute_actions

[Simon Horman]

On Tue, Nov 26, 2013 at 07:34:18AM -0800, Jarno Rajahalme wrote:
> 
> > On Nov 25, 2013, at 10:49 PM, Simon Horman <horms at verge.net.au> wrote:
> > 
> > The skb_priority, pkt_mark and tunl parameters dp_netdev_execute_actions
> 
> I guess you meant dp_netdev_port_input...
> 
> Conceptually I think this change is right, except maybe for tunnel parameters, depending on how tunneling is implemented on the userspace datapath some day. We can fix that when the time comes, so this is fine for now.

Yes I agree that may be useful at some point but that it should
be added back once a use-case arises.

> Can you fix the commit message?

Sure, will do.

> 
>   Jarno
> 
> > are always passed as 0, 0 and NULL respectively. So rather than
> > passing these values to dp_netdev_execute_actions just use them directly.
> > 
> > Signed-off-by: Simon Horman <horms at verge.net.au>
> > ---
> > lib/dpif-netdev.c | 10 ++++------
> > 1 file changed, 4 insertions(+), 6 deletions(-)
> > 
> > diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
> > index 911cb5d..7cdbb9b 100644
> > --- a/lib/dpif-netdev.c
> > +++ b/lib/dpif-netdev.c
> > @@ -174,8 +174,7 @@ static void dp_netdev_execute_actions(struct dp_netdev *, const struct flow *,
> >                                       size_t actions_len);
> > static void dp_netdev_port_input(struct dp_netdev *dp,
> >                                  struct dp_netdev_port *port,
> > -                                 struct ofpbuf *packet, uint32_t skb_priority,
> > -                                 uint32_t pkt_mark, const struct flow_tnl *tnl);
> > +                                 struct ofpbuf *packet);
> > 
> > static struct dpif_netdev *
> > dpif_netdev_cast(const struct dpif *dpif)
> > @@ -1229,8 +1228,7 @@ dp_netdev_flow_used(struct dp_netdev_flow *netdev_flow,
> > 
> > static void
> > dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port,
> > -                     struct ofpbuf *packet, uint32_t skb_priority,
> > -                     uint32_t pkt_mark, const struct flow_tnl *tnl)
> > +                     struct ofpbuf *packet)
> > {
> >     struct dp_netdev_flow *netdev_flow;
> >     struct flow key;
> > @@ -1240,7 +1238,7 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port,
> >         return;
> >     }
> >     in_port_.odp_port = port->port_no;
> > -    flow_extract(packet, skb_priority, pkt_mark, tnl, &in_port_, &key);
> > +    flow_extract(packet, 0, 0, NULL, &in_port_, &key);
> >     netdev_flow = dp_netdev_lookup_flow(dp, &key);
> >     if (netdev_flow) {
> >         dp_netdev_flow_used(netdev_flow, packet);
> > @@ -1275,7 +1273,7 @@ dpif_netdev_run(struct dpif *dpif)
> > 
> >         error = port->rx ? netdev_rx_recv(port->rx, &packet) : EOPNOTSUPP;
> >         if (!error) {
> > -            dp_netdev_port_input(dp, port, &packet, 0, 0, NULL);
> > +            dp_netdev_port_input(dp, port, &packet);
> >         } else if (error != EAGAIN && error != EOPNOTSUPP) {
> >             static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
> > 
> > -- 
> > 1.8.4
> > 
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
>