[ovs-dev] [threaded-learning 19/25] ofproto: Make some functions for rules private to ofproto.c.
Ben Pfaff
blp at nicira.com
Wed Sep 11 05:27:19 UTC 2013
These aren't used outside this file.
Signed-off-by: Ben Pfaff <blp at nicira.com>
---
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 3684b0c..d477434 100644
--- a/ofproto/ofproto-provider.h
+++ b/ofproto/ofproto-provider.h
@@ -326,14 +326,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 c325cef..507c9a6 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2396,7 +2396,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
@@ -2405,7 +2405,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
@@ -2485,7 +2485,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
More information about the dev
mailing list