[ovs-dev] [bug9964 5/5] connmgr: Remove now-unused function connmgr_broadcast().

Ben Pfaff blp at nicira.com
Thu Mar 15 17:33:19 UTC 2012


Thanks, I pushed this series to master.  I'm backporting to branch-1.6
now.

On Wed, Mar 14, 2012 at 02:47:02PM -0700, Ethan Jackson wrote:
> Looks good.
> 
> Ethan
> 
> On Mon, Mar 12, 2012 at 14:38, Ben Pfaff <blp at nicira.com> wrote:
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> >  ofproto/connmgr.c |   23 -----------------------
> >  ofproto/connmgr.h |    1 -
> >  2 files changed, 0 insertions(+), 24 deletions(-)
> >
> > diff --git a/ofproto/connmgr.c b/ofproto/connmgr.c
> > index 1f5fbed..ed1aac2 100644
> > --- a/ofproto/connmgr.c
> > +++ b/ofproto/connmgr.c
> > @@ -1438,29 +1438,6 @@ connmgr_is_any_controller_admitted(const struct connmgr *mgr)
> >     }
> >     return false;
> >  }
> > -
> > -/* Sends 'packet' to each controller connected to 'mgr'.  Takes ownership of
> > - * 'packet'. */
> > -void
> > -connmgr_broadcast(struct connmgr *mgr, struct ofpbuf *packet)
> > -{
> > -    struct ofconn *ofconn, *prev;
> > -
> > -    prev = NULL;
> > -    LIST_FOR_EACH (ofconn, node, &mgr->all_conns) {
> > -        if (prev) {
> > -            ofconn_send_reply(ofconn, ofpbuf_clone(packet));
> > -        }
> > -        if (rconn_is_connected(ofconn->rconn)) {
> > -            prev = ofconn;
> > -        }
> > -    }
> > -    if (prev) {
> > -        ofconn_send_reply(prev, packet);
> > -    } else {
> > -        ofpbuf_delete(packet);
> > -    }
> > -}
> >
> >  /* In-band configuration. */
> >
> > diff --git a/ofproto/connmgr.h b/ofproto/connmgr.h
> > index 6d404cf..81ca51b 100644
> > --- a/ofproto/connmgr.h
> > +++ b/ofproto/connmgr.h
> > @@ -140,7 +140,6 @@ int connmgr_get_max_probe_interval(const struct connmgr *);
> >  bool connmgr_is_any_controller_connected(const struct connmgr *);
> >  bool connmgr_is_any_controller_admitted(const struct connmgr *);
> >  int connmgr_failure_duration(const struct connmgr *);
> > -void connmgr_broadcast(struct connmgr *, struct ofpbuf *);
> >
> >  /* In-band configuration. */
> >  void connmgr_set_extra_in_band_remotes(struct connmgr *,
> > --
> > 1.7.2.5
> >
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev



More information about the dev mailing list