Acked-by: Ethan Jackson <[email protected]>
On Fri, Aug 16, 2013 at 8:55 AM, Ben Pfaff <[email protected]> wrote: > The 'pins' list contains packet-ins, not flow-mods. > > Introduced by commit ada3a58d1f8 (ofproto-dpif: Make packet_ins thread > safe.). > > Signed-off-by: Ben Pfaff <[email protected]> > --- > ofproto/ofproto-dpif.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c > index 4c5a776..a13901a 100644 > --- a/ofproto/ofproto-dpif.c > +++ b/ofproto/ofproto-dpif.c > @@ -1404,7 +1404,7 @@ destruct(struct ofproto *ofproto_) > { > struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); > struct rule_dpif *rule, *next_rule; > - struct ofputil_flow_mod *pin, *next_pin; > + struct ofputil_packet_in *pin, *next_pin; > struct ofputil_flow_mod *fm, *next_fm; > struct oftable *table; > > @@ -1441,7 +1441,7 @@ destruct(struct ofproto *ofproto_) > LIST_FOR_EACH_SAFE (pin, next_pin, list_node, &ofproto->pins) { > list_remove(&pin->list_node); > ofproto->n_pins--; > - free(pin->ofpacts); > + free(CONST_CAST(void *, pin->packet)); > free(pin); > } > ovs_mutex_unlock(&ofproto->pin_mutex); > -- > 1.7.10.4 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev X-CudaMail-Whitelist-To: [email protected] _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
