Acked-by: Ethan Jackson <[email protected]>
On Thu, Sep 12, 2013 at 12:39 AM, Ben Pfaff <[email protected]> wrote: > These aren't used outside this file. > > Signed-off-by: Ben Pfaff <[email protected]> > --- > ofproto/ofproto-provider.h | 5 ----- > ofproto/ofproto.c | 6 +++--- > 2 files changed, 3 insertions(+), 8 deletions(-) > > diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h > index f62b57a..6583294e 100644 > --- a/ofproto/ofproto-provider.h > +++ b/ofproto/ofproto-provider.h > @@ -343,14 +343,9 @@ void ofproto_rule_reduce_timeouts(struct rule *rule, > uint16_t idle_timeout, > uint16_t hard_timeout) > OVS_EXCLUDED(ofproto_mutex, rule->mutex); > > -bool ofproto_rule_has_out_port(const struct rule *, ofp_port_t out_port); > - > void ofoperation_complete(struct ofoperation *, enum ofperr); > > bool ofoperation_has_out_port(const struct ofoperation *, ofp_port_t > out_port); > -bool ofproto_rule_has_out_group(const struct rule *, uint32_t group_id); > - > -bool ofproto_rule_is_hidden(const struct rule *); > > /* A group within a "struct ofproto". > * > diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c > index 6222899..882d503 100644 > --- a/ofproto/ofproto.c > +++ b/ofproto/ofproto.c > @@ -2429,7 +2429,7 @@ rule_actions_unref(struct rule_actions *actions) > > /* Returns true if 'rule' has an OpenFlow OFPAT_OUTPUT or OFPAT_ENQUEUE > action > * that outputs to 'port' (output to OFPP_FLOOD and OFPP_ALL doesn't count). > */ > -bool > +static bool > ofproto_rule_has_out_port(const struct rule *rule, ofp_port_t port) > { > return (port == OFPP_ANY > @@ -2438,7 +2438,7 @@ ofproto_rule_has_out_port(const struct rule *rule, > ofp_port_t port) > } > > /* Returns true if 'rule' has group and equals group_id. */ > -bool > +static bool > ofproto_rule_has_out_group(const struct rule *rule, uint32_t group_id) > { > return (group_id == OFPG11_ANY > @@ -2518,7 +2518,7 @@ destroy_rule_executes(struct ofproto *ofproto) > * Rules with priority higher than UINT16_MAX are set up by ofproto itself > * (e.g. by in-band control) and are intentionally hidden from the > * controller. */ > -bool > +static bool > ofproto_rule_is_hidden(const struct rule *rule) > { > return rule->cr.priority > UINT16_MAX; > -- > 1.7.10.4 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
