Thanks, applied to master.
On Wed, Jul 22, 2015 at 12:55:51PM -0700, Jarno Rajahalme wrote:
> Acked-by: Jarno Rajahalme <jrajaha...@nicira.com>
>
> > On Jul 22, 2015, at 12:17 PM, Ben Pfaff <b...@nicira.com> wrote:
> >
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > ofproto/netflow.c | 7 ++++---
> > ofproto/netflow.h | 6 +++---
> > 2 files changed, 7 insertions(+), 6 deletions(-)
> >
> > diff --git a/ofproto/netflow.c b/ofproto/netflow.c
> > index 0470443..f1b6fbe 100644
> > --- a/ofproto/netflow.c
> > +++ b/ofproto/netflow.c
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright (c) 2008, 2009, 2010, 2011, 2013, 2014 Nicira, Inc.
> > + * Copyright (c) 2008, 2009, 2010, 2011, 2013, 2014, 2015 Nicira, Inc.
> > *
> > * Licensed under the Apache License, Version 2.0 (the "License");
> > * you may not use this file except in compliance with the License.
> > @@ -90,7 +90,7 @@ static void netflow_expire__(struct netflow *, struct
> > netflow_flow *)
> > static void netflow_run__(struct netflow *) OVS_REQUIRES(mutex);
> >
> > void
> > -netflow_mask_wc(struct flow *flow, struct flow_wildcards *wc)
> > +netflow_mask_wc(const struct flow *flow, struct flow_wildcards *wc)
> > {
> > if (flow->dl_type != htons(ETH_TYPE_IP)) {
> > return;
> > @@ -276,7 +276,8 @@ netflow_expire__(struct netflow *nf, struct
> > netflow_flow *nf_flow)
> > }
> >
> > void
> > -netflow_flow_clear(struct netflow *nf, struct flow *flow)
> > OVS_EXCLUDED(mutex)
> > +netflow_flow_clear(struct netflow *nf, const struct flow *flow)
> > + OVS_EXCLUDED(mutex)
> > {
> > struct netflow_flow *nf_flow;
> >
> > diff --git a/ofproto/netflow.h b/ofproto/netflow.h
> > index 94dd3ff..688a35d 100644
> > --- a/ofproto/netflow.h
> > +++ b/ofproto/netflow.h
> > @@ -1,5 +1,5 @@
> > /*
> > - * Copyright (c) 2008, 2009, 2010, 2011, 2013, 2014 Nicira, Inc.
> > + * Copyright (c) 2008, 2009, 2010, 2011, 2013, 2014, 2015 Nicira, Inc.
> > *
> > * Licensed under the Apache License, Version 2.0 (the "License");
> > * you may not use this file except in compliance with the License.
> > @@ -50,9 +50,9 @@ int netflow_set_options(struct netflow *, const struct
> > netflow_options *);
> > void netflow_run(struct netflow *);
> > void netflow_wait(struct netflow *);
> >
> > -void netflow_mask_wc(struct flow *, struct flow_wildcards *);
> > +void netflow_mask_wc(const struct flow *, struct flow_wildcards *);
> >
> > -void netflow_flow_clear(struct netflow *netflow, struct flow *flow);
> > +void netflow_flow_clear(struct netflow *, const struct flow *);
> >
> > void netflow_flow_update(struct netflow *nf, const struct flow *flow,
> > ofp_port_t output_iface,
> > --
> > 2.1.3
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
