From: Ben Pfaff <blp@nicira.com>
Date: Wed, 11 Sep 2013 04:01:34 +0000 (-0700)
Subject: ofproto: Make some functions for rules private to ofproto.c.
X-Git-Tag: sliver-openvswitch-2.0.90-1~14^2~14
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=74e79b7c249f4a38fc6e36dd86cf6eef95f2f800;p=sliver-openvswitch.git

ofproto: Make some functions for rules private to ofproto.c.

These aren't used outside this file.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>
---

diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h
index f62b57a15..6583294ee 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 c916a584e..71f4a0ef7 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2431,7 +2431,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
@@ -2440,7 +2440,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
@@ -2520,7 +2520,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;