X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif-xlate.h;h=ba24e926fd95e1b0577c92d27d26bea322018131;hb=6b900de4efd368be88ef3db88b1eff8f835a7cf7;hp=c82bc6420e00f6a7302d1e5755be8294026761c4;hpb=ec7ceaed4f3e03a3e59056a3a82a08886c328ce8;p=sliver-openvswitch.git

diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h
index c82bc6420..ba24e926f 100644
--- a/ofproto/ofproto-dpif-xlate.h
+++ b/ofproto/ofproto-dpif-xlate.h
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-#ifndef OFPROT_DPIF_XLATE_H
-#define OFPROT_DPIF_XLATE_H 1
+#ifndef OFPROTO_DPIF_XLATE_H
+#define OFPROTO_DPIF_XLATE_H 1
 
 #include "flow.h"
 #include "meta-flow.h"
@@ -21,7 +21,14 @@
 #include "ofpbuf.h"
 #include "ofproto-dpif-mirror.h"
 #include "ofproto-dpif.h"
-#include "tag.h"
+
+struct bfd;
+struct bond;
+struct dpif;
+struct lacp;
+struct dpif_ipfix;
+struct dpif_sflow;
+struct mac_learning;
 
 struct xlate_out {
     /* Wildcards relevant in translation.  Any fields that were used to
@@ -33,7 +40,6 @@ struct xlate_out {
      * set. */
     struct flow_wildcards wc;
 
-    tag_type tags;              /* Tags associated with actions. */
     enum slow_path_reason slow; /* 0 if fast path may be used. */
     bool has_learn;             /* Actions include NXAST_LEARN? */
     bool has_normal;            /* Actions output to OFPP_NORMAL? */
@@ -104,12 +110,46 @@ struct xlate_in {
     const struct dpif_flow_stats *resubmit_stats;
 };
 
-void xlate_actions(struct xlate_in *, struct xlate_out *);
+extern struct ovs_rwlock xlate_rwlock;
+
+void xlate_ofproto_set(struct ofproto_dpif *, const char *name,
+                       struct dpif *, struct rule_dpif *miss_rule,
+                       struct rule_dpif *no_packet_in_rule,
+                       const struct mac_learning *, struct stp *,
+                       const struct mbridge *, const struct dpif_sflow *,
+                       const struct dpif_ipfix *, enum ofp_config_flags,
+                       bool forward_bpdu, bool has_in_band, bool has_netflow)
+    OVS_REQ_WRLOCK(xlate_rwlock);
+void xlate_remove_ofproto(struct ofproto_dpif *) OVS_REQ_WRLOCK(xlate_rwlock);
+
+void xlate_bundle_set(struct ofproto_dpif *, struct ofbundle *,
+                      const char *name, enum port_vlan_mode, int vlan,
+                      unsigned long *trunks, bool use_priority_tags,
+                      const struct bond *, const struct lacp *,
+                      bool floodable) OVS_REQ_WRLOCK(xlate_rwlock);
+void xlate_bundle_remove(struct ofbundle *) OVS_REQ_WRLOCK(xlate_rwlock);
+
+void xlate_ofport_set(struct ofproto_dpif *, struct ofbundle *,
+                      struct ofport_dpif *, ofp_port_t, odp_port_t,
+                      const struct netdev *, const struct cfm *,
+                      const struct bfd *, struct ofport_dpif *peer,
+                      int stp_port_no, const struct ofproto_port_queue *qdscp,
+                      size_t n_qdscp, enum ofputil_port_config, bool is_tunnel,
+                      bool may_enable) OVS_REQ_WRLOCK(xlate_rwlock);
+void xlate_ofport_remove(struct ofport_dpif *) OVS_REQ_WRLOCK(xlate_rwlock);
+
+int xlate_receive(const struct dpif_backer *, struct ofpbuf *packet,
+                  const struct nlattr *key, size_t key_len,
+                  struct flow *, enum odp_key_fitness *,
+                  struct ofproto_dpif **, odp_port_t *odp_in_port)
+    OVS_EXCLUDED(xlate_rwlock);
+
+void xlate_actions(struct xlate_in *, struct xlate_out *)
+    OVS_EXCLUDED(xlate_rwlock);
 void xlate_in_init(struct xlate_in *, struct ofproto_dpif *,
                    const struct flow *, struct rule_dpif *,
                    uint8_t tcp_flags, const struct ofpbuf *packet);
 void xlate_out_uninit(struct xlate_out *);
 void xlate_actions_for_side_effects(struct xlate_in *);
 void xlate_out_copy(struct xlate_out *dst, const struct xlate_out *src);
-
 #endif /* ofproto-dpif-xlate.h */