tnl-arp-cache: Rename module and functions to tnl-neigh-cache.

[cascardo/ovs.git] / ofproto / ofproto-dpif.h

diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h
index 7bb45e3..dab422a 100644 (file)
--- a/ofproto/ofproto-dpif.h
+++ b/ofproto/ofproto-dpif.h
@@ -102,7 +102,6 @@ cls_version_t ofproto_dpif_get_tables_version(struct ofproto_dpif *);
 struct rule_dpif *rule_dpif_lookup_from_table(struct ofproto_dpif *,
                                               cls_version_t, struct flow *,
                                               struct flow_wildcards *,
-                                              bool take_ref,
                                               const struct dpif_flow_stats *,
                                               uint8_t *table_id,
                                               ofp_port_t in_port,
@@ -131,11 +130,6 @@ ovs_be64 rule_dpif_get_flow_cookie(const struct rule_dpif *rule);
 void rule_dpif_reduce_timeouts(struct rule_dpif *rule, uint16_t idle_timeout,
                                uint16_t hard_timeout);
 
-void choose_miss_rule(enum ofputil_port_config,
-                      struct rule_dpif *miss_rule,
-                      struct rule_dpif *no_packet_in_rule,
-                      struct rule_dpif **rule, bool take_ref);
-
 void group_dpif_credit_stats(struct group_dpif *,
                              struct ofputil_bucket *,
                              const struct dpif_flow_stats *);
@@ -159,6 +153,10 @@ bool vsp_adjust_flow(const struct ofproto_dpif *, struct flow *,
 int ofproto_dpif_execute_actions(struct ofproto_dpif *, const struct flow *,
                                  struct rule_dpif *, const struct ofpact *,
                                  size_t ofpacts_len, struct dp_packet *);
+int ofproto_dpif_execute_actions__(struct ofproto_dpif *, const struct flow *,
+                                   struct rule_dpif *, const struct ofpact *,
+                                   size_t ofpacts_len, int recurse,
+                                   int resubmits, struct dp_packet *);
 void ofproto_dpif_send_packet_in(struct ofproto_dpif *,
                                  struct ofproto_packet_in *);
 bool ofproto_dpif_wants_packet_in_on_miss(struct ofproto_dpif *);
@@ -171,6 +169,8 @@ struct ofport_dpif *odp_port_to_ofport(const struct dpif_backer *, odp_port_t);
 struct ofport_dpif *ofp_port_to_ofport(const struct ofproto_dpif *,
                                        ofp_port_t);
 
+bool ofproto_dpif_backer_enabled(struct dpif_backer* backer);
+
 int ofproto_dpif_add_internal_flow(struct ofproto_dpif *,
                                    const struct match *, int priority,
                                    uint16_t idle_timeout,
@@ -205,15 +205,6 @@ static inline void rule_dpif_ref(struct rule_dpif *rule)
     }
 }
 
-static inline bool rule_dpif_try_ref(struct rule_dpif *rule)
-{
-    if (rule) {
-        return ofproto_rule_try_ref(RULE_CAST(rule));
-    }
-    return false;
-}
-
-
 static inline void rule_dpif_unref(struct rule_dpif *rule)
 {
     if (rule) {