s/nx_flow_end_reason/ofp_flow_removed_reason/g

Replaced references to custom Nicira flow end reason and replaced with
OpenFlow flow removed reason.

datapath/datapath.c

@@ -1023,7 +1023,7 @@ static u64 inline jiffies_64_to_msecs(const u64 j)
 
 int 
 dp_send_flow_end(struct datapath *dp, struct sw_flow *flow,
-		     enum nx_flow_end_reason reason)
+		     enum ofp_flow_removed_reason reason)
 {
 	struct sk_buff *skb;
 	struct nx_flow_end *nfe;

datapath/datapath.h

@@ -96,7 +96,7 @@ int dp_send_features_reply(struct datapath *, const struct sender *);
 int dp_send_config_reply(struct datapath *, const struct sender *);
 int dp_send_port_status(struct net_bridge_port *p, uint8_t status);
 int dp_send_flow_end(struct datapath *, struct sw_flow *,
-			 enum nx_flow_end_reason);
+			 enum ofp_flow_removed_reason);
 int dp_send_error_msg(struct datapath *, const struct sender *, 
 			uint16_t, uint16_t, const void *, size_t);
 int dp_update_port_flags(struct datapath *dp, const struct ofp_port_mod *opm);

datapath/hwtable_dummy/hwtable_dummy.c

@@ -68,7 +68,7 @@ static int tmpl_modify_flow(struct sw_table *, const struct sw_flow_key *,
 			    uint16_t, int, const struct ofp_action_header *,
 			    size_t);
 static int do_uninstall(struct datapath *, struct sw_table *, struct sw_flow *,
-			enum nx_flow_end_reason);
+			enum ofp_flow_removed_reason);
 static int tmpl_uninstall_flow(struct datapath *, struct sw_table *,
 			       const struct sw_flow_key *,
 			       uint16_t, uint16_t, int);
@@ -139,7 +139,7 @@ tmpl_modify_flow(struct sw_table *flowtab, const struct sw_flow_key *key,
 
 static int
 do_uninstall(struct datapath *dpinst, struct sw_table *flowtab,
-	     struct sw_flow *flow, enum nx_flow_end_reason reason)
+	     struct sw_flow *flow, enum ofp_flow_removed_reason reason)
 {
 	/* XXX: Remove the entry from hardware.  If you need to do any other
 	 * clean-up associated with the entry, do it here.

datapath/hwtable_nf2/nf2_flowtable.c

@@ -68,7 +68,7 @@ static int nf2_modify_flow(struct sw_table *, const struct sw_flow_key *,
 static void deferred_uninstall_callback(struct rcu_head *);
 static void do_deferred_uninstall(struct sw_flow *);
 static int do_uninstall(struct datapath *, struct sw_table *, struct sw_flow *,
-			enum nx_flow_end_reason);
+			enum ofp_flow_removed_reason);
 static int nf2_has_conflict(struct sw_table *, const struct sw_flow_key *,
 			    uint16_t, int);
 static int nf2_uninstall_flow(struct datapath *, struct sw_table *,
@@ -182,7 +182,7 @@ do_deferred_uninstall(struct sw_flow *flow)
 
 static int
 do_uninstall(struct datapath *dpinst, struct sw_table *flowtab,
-	     struct sw_flow *flow, enum nx_flow_end_reason reason)
+	     struct sw_flow *flow, enum ofp_flow_removed_reason reason)
 {
 	if (flow != NULL && flow->private != NULL) {
 		if (dpinst != NULL)

datapath/table-hash.c

@@ -131,7 +131,7 @@ static int table_hash_has_conflict(struct sw_table *swt,
 
 /* Caller must update n_flows. */
 static int do_delete(struct datapath *dp, struct sw_flow **bucket, 
-			struct sw_flow *flow, enum nx_flow_end_reason reason)
+			struct sw_flow *flow, enum ofp_flow_removed_reason reason)
 {
 	dp_send_flow_end(dp, flow, reason);
 	rcu_assign_pointer(*bucket, NULL);

datapath/table-linear.c

@@ -106,7 +106,7 @@ static int table_linear_has_conflict(struct sw_table *swt,
 }
 
 static int do_delete(struct datapath *dp, struct sw_table *swt, 
-			struct sw_flow *flow, enum nx_flow_end_reason reason) 
+			struct sw_flow *flow, enum ofp_flow_removed_reason reason)
 {
 	dp_send_flow_end(dp, flow, reason);
 	list_del_rcu(&flow->node);

udatapath/datapath.c

@@ -728,7 +728,7 @@ send_port_status(struct sw_port *p, uint8_t status)
 
 void
 dp_send_flow_end(struct datapath *dp, struct sw_flow *flow,
-              enum nx_flow_end_reason reason)
+              enum ofp_flow_removed_reason reason)
 {
     struct ofpbuf *buffer;
     struct nx_flow_end *nfe;

udatapath/datapath.h

@@ -97,7 +97,7 @@ void dp_wait(struct datapath *);
 void dp_send_error_msg(struct datapath *, const struct sender *,
                   uint16_t, uint16_t, const void *, size_t);
 void dp_send_flow_end(struct datapath *, struct sw_flow *,
-                      enum nx_flow_end_reason);
+                      enum ofp_flow_removed_reason);
 void dp_output_port(struct datapath *, struct ofpbuf *, int in_port, 
         int out_port, bool ignore_no_fwd);
 void dp_output_control(struct datapath *, struct ofpbuf *, int in_port,