X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Ftunnel.h;h=27a2f7dbc298894ad239f5afc4fc8f28bf8b8cd8;hb=fa04edcedfe5285fd8ad3a4d70fecb38df18293d;hp=1b055aef415b3d4c86f1311041019a25a6c073fc;hpb=780325b5b8d4c0552b4b7719e0a38200d99f6b08;p=sliver-openvswitch.git

diff --git a/ofproto/tunnel.h b/ofproto/tunnel.h
index 1b055aef4..27a2f7dbc 100644
--- a/ofproto/tunnel.h
+++ b/ofproto/tunnel.h
@@ -20,25 +20,26 @@
 #include <stdint.h>
 #include "flow.h"
 
-/* skb mark used for IPsec tunnel packets */
-#define IPSEC_MARK 1
-
 /* Tunnel port emulation layer.
  *
  * These functions emulate tunnel virtual ports based on the outer
  * header information from the kernel. */
 
-struct ofport;
-struct tnl_port;
+struct ofport_dpif;
+struct netdev;
 
-bool tnl_port_reconfigure(const struct ofport *, uint32_t odp_port,
-                          struct tnl_port **);
+bool tnl_port_reconfigure(const struct ofport_dpif *, const struct netdev *,
+                          odp_port_t);
 
-struct tnl_port *tnl_port_add(const struct ofport *, uint32_t odp_port);
-void tnl_port_del(struct tnl_port *);
+void tnl_port_add(const struct ofport_dpif *, const struct netdev *,
+                  odp_port_t odp_port);
+void tnl_port_del(const struct ofport_dpif *);
 
-const struct ofport *tnl_port_receive(struct flow *);
-uint32_t tnl_port_send(const struct tnl_port *, struct flow *);
+const struct ofport_dpif *tnl_port_receive(const struct flow *);
+bool tnl_xlate_init(const struct flow *base_flow, struct flow *flow,
+                    struct flow_wildcards *);
+odp_port_t tnl_port_send(const struct ofport_dpif *, struct flow *,
+                         struct flow_wildcards *wc);
 
 /* Returns true if 'flow' should be submitted to tnl_port_receive(). */
 static inline bool