Thank you. I pushed this to master.
On Tue, Jan 31, 2012 at 11:58:56PM -0800, Justin Pettit wrote:
> Looks good.
>
> --Justin
>
>
> On Jan 31, 2012, at 12:56 PM, Ben Pfaff wrote:
>
> > These are useful hints, in these cases, that the caller retains ownership
> > of the passed-in packets.
> >
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > lib/dpif.c | 2 +-
> > lib/dpif.h | 4 ++--
> > ofproto/ofproto-dpif.c | 2 +-
> > 3 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/lib/dpif.c b/lib/dpif.c
> > index a01b998..d41bfc1 100644
> > --- a/lib/dpif.c
> > +++ b/lib/dpif.c
> > @@ -670,7 +670,7 @@ dpif_port_poll_wait(const struct dpif *dpif)
> > * arguments must have been initialized through a call to flow_extract().
> > */
> > void
> > -dpif_flow_stats_extract(const struct flow *flow, struct ofpbuf *packet,
> > +dpif_flow_stats_extract(const struct flow *flow, const struct ofpbuf
> > *packet,
> > struct dpif_flow_stats *stats)
> > {
> > memset(stats, 0, sizeof(*stats));
> > diff --git a/lib/dpif.h b/lib/dpif.h
> > index 0ff2389..34fba63 100644
> > --- a/lib/dpif.h
> > +++ b/lib/dpif.h
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
> > + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks.
> > *
> > * Licensed under the Apache License, Version 2.0 (the "License");
> > * you may not use this file except in compliance with the License.
> > @@ -128,7 +128,7 @@ struct dpif_flow_stats {
> > uint8_t tcp_flags;
> > };
> >
> > -void dpif_flow_stats_extract(const struct flow *, struct ofpbuf *packet,
> > +void dpif_flow_stats_extract(const struct flow *, const struct ofpbuf
> > *packet,
> > struct dpif_flow_stats *);
> > void dpif_flow_stats_format(const struct dpif_flow_stats *, struct ds *);
> >
> > diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
> > index b6e42f8..d349696 100644
> > --- a/ofproto/ofproto-dpif.c
> > +++ b/ofproto/ofproto-dpif.c
> > @@ -2410,7 +2410,7 @@ struct flow_miss_op {
> > * OpenFlow controller as necessary according to their individual
> > * configurations. */
> > static void
> > -send_packet_in_miss(struct ofproto_dpif *ofproto, struct ofpbuf *packet,
> > +send_packet_in_miss(struct ofproto_dpif *ofproto, const struct ofpbuf
> > *packet,
> > const struct flow *flow)
> > {
> > struct ofputil_packet_in pin;
> > --
> > 1.7.2.5
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
