Re: [ovs-dev] [PATCH v2 07/26] ofproto: Generalize flow_mod_requester.

[Ben Pfaff]

On Thu, Jul 28, 2016 at 05:55:59PM -0700, Jarno Rajahalme wrote:
> Group mods also need a 'requester', so rename 'flow_mod_requester' as
> 'openflow_mod_requester'.
> 
> Signed-off-by: Jarno Rajahalme 

Acked-by: Ben Pfaff 
___
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev

[ovs-dev] [PATCH v2 07/26] ofproto: Generalize flow_mod_requester.

[Jarno Rajahalme]

Group mods also need a 'requester', so rename 'flow_mod_requester' as
'openflow_mod_requester'.

Signed-off-by: Jarno Rajahalme 
---
 ofproto/ofproto.c | 50 --
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 8df93d3..a5d681a 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -252,13 +252,13 @@ static void ofproto_rule_insert__(struct ofproto *, 
struct rule *)
 static void ofproto_rule_remove__(struct ofproto *, struct rule *)
 OVS_REQUIRES(ofproto_mutex);
 
-/* The source of a flow_mod request, in the code that processes flow_mods.
+/* The source of an OpenFlow request.
  *
- * A flow table modification request can be generated externally, via OpenFlow,
- * or internally through a function call.  This structure indicates the source
- * of an OpenFlow-generated flow_mod.  For an internal flow_mod, it isn't
- * meaningful and thus supplied as NULL. */
-struct flow_mod_requester {
+ * A table modification request can be generated externally, via OpenFlow, or
+ * internally through a function call.  This structure indicates the source of
+ * an OpenFlow-generated table modification.  For an internal flow_mod, it
+ * isn't meaningful and thus supplied as NULL. */
+struct openflow_mod_requester {
 struct ofconn *ofconn;  /* Connection on which flow_mod arrived. */
 const struct ofp_header *request;
 };
@@ -281,16 +281,16 @@ static void replace_rule_revert(struct ofproto *, struct 
rule *old_rule,
 OVS_REQUIRES(ofproto_mutex);
 
 static void replace_rule_finish(struct ofproto *, struct ofputil_flow_mod *,
-const struct flow_mod_requester *,
+const struct openflow_mod_requester *,
 struct rule *old_rule, struct rule *new_rule,
 struct ovs_list *dead_cookies)
 OVS_REQUIRES(ofproto_mutex);
 static void delete_flows__(struct rule_collection *,
enum ofp_flow_removed_reason,
-   const struct flow_mod_requester *)
+   const struct openflow_mod_requester *)
 OVS_REQUIRES(ofproto_mutex);
 
-static void send_buffered_packet(const struct flow_mod_requester *,
+static void send_buffered_packet(const struct openflow_mod_requester *,
  uint32_t buffer_id, struct rule *)
 OVS_REQUIRES(ofproto_mutex);
 
@@ -304,11 +304,11 @@ static enum ofperr ofproto_flow_mod_start(struct ofproto 
*,
 OVS_REQUIRES(ofproto_mutex);
 static void ofproto_flow_mod_finish(struct ofproto *,
 struct ofproto_flow_mod *,
-const struct flow_mod_requester *)
+const struct openflow_mod_requester *)
 OVS_REQUIRES(ofproto_mutex);
 static enum ofperr handle_flow_mod__(struct ofproto *,
  struct ofproto_flow_mod *,
- const struct flow_mod_requester *)
+ const struct openflow_mod_requester *)
 OVS_EXCLUDED(ofproto_mutex);
 static void calc_duration(long long int start, long long int now,
   uint32_t *sec, uint32_t *nsec);
@@ -4855,7 +4855,7 @@ add_flow_revert(struct ofproto *ofproto, struct 
ofproto_flow_mod *ofm)
 /* To be called after version bump. */
 static void
 add_flow_finish(struct ofproto *ofproto, struct ofproto_flow_mod *ofm,
-const struct flow_mod_requester *req)
+const struct openflow_mod_requester *req)
 OVS_REQUIRES(ofproto_mutex)
 {
 struct ofputil_flow_mod *fm = >fm;
@@ -5016,7 +5016,7 @@ replace_rule_revert(struct ofproto *ofproto,
 /* Adds the 'new_rule', replacing the 'old_rule'. */
 static void
 replace_rule_finish(struct ofproto *ofproto, struct ofputil_flow_mod *fm,
-const struct flow_mod_requester *req,
+const struct openflow_mod_requester *req,
 struct rule *old_rule, struct rule *new_rule,
 struct ovs_list *dead_cookies)
 OVS_REQUIRES(ofproto_mutex)
@@ -5183,7 +5183,7 @@ modify_flows_revert(struct ofproto *ofproto, struct 
ofproto_flow_mod *ofm)
 
 static void
 modify_flows_finish(struct ofproto *ofproto, struct ofproto_flow_mod *ofm,
-const struct flow_mod_requester *req)
+const struct openflow_mod_requester *req)
 OVS_REQUIRES(ofproto_mutex)
 {
 struct ofputil_flow_mod *fm = >fm;
@@ -5267,7 +5267,7 @@ static void
 delete_flows_finish__(struct ofproto *ofproto,
   struct rule_collection *rules,
   enum ofp_flow_removed_reason reason,
-  const struct flow_mod_requester *req)
+  const struct openflow_mod_requester *req)