Acked-by: Ethan Jackson <[email protected]>
On Mon, Sep 24, 2012 at 1:38 PM, Ben Pfaff <[email protected]> wrote: > The 'key' passed to dp_netdev_flow_used() is the same as the 'key' member > in the struct dp_netdev_flow also passed to the function. > > Signed-off-by: Ben Pfaff <[email protected]> > --- > lib/dpif-netdev.c | 7 +++---- > 1 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c > index 144b6b6..dc4479e 100644 > --- a/lib/dpif-netdev.c > +++ b/lib/dpif-netdev.c > @@ -996,13 +996,12 @@ dpif_netdev_recv_purge(struct dpif *dpif) > } > > static void > -dp_netdev_flow_used(struct dp_netdev_flow *flow, struct flow *key, > - const struct ofpbuf *packet) > +dp_netdev_flow_used(struct dp_netdev_flow *flow, const struct ofpbuf *packet) > { > flow->used = time_msec(); > flow->packet_count++; > flow->byte_count += packet->size; > - flow->tcp_flags |= packet_get_tcp_flags(packet, key); > + flow->tcp_flags |= packet_get_tcp_flags(packet, &flow->key); > } > > static void > @@ -1018,7 +1017,7 @@ dp_netdev_port_input(struct dp_netdev *dp, struct > dp_netdev_port *port, > flow_extract(packet, 0, 0, odp_port_to_ofp_port(port->port_no), &key); > flow = dp_netdev_lookup_flow(dp, &key); > if (flow) { > - dp_netdev_flow_used(flow, &key, packet); > + dp_netdev_flow_used(flow, packet); > dp_netdev_execute_actions(dp, packet, &key, > flow->actions, flow->actions_len); > dp->n_hit++; > -- > 1.7.2.5 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
