X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Ftunnel.h;h=27a2f7dbc298894ad239f5afc4fc8f28bf8b8cd8;hb=HEAD;hp=19035c3effb0178fe8981bc618d051458da43284;hpb=e1939dbf92a60d0f235621f4d79661f47c5aed0c;p=sliver-openvswitch.git

diff --git a/ofproto/tunnel.h b/ofproto/tunnel.h
index 19035c3ef..27a2f7dbc 100644
--- a/ofproto/tunnel.h
+++ b/ofproto/tunnel.h
@@ -20,9 +20,6 @@
 #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
@@ -30,17 +27,18 @@
 
 struct ofport_dpif;
 struct netdev;
-struct tnl_port;
 
 bool tnl_port_reconfigure(const struct ofport_dpif *, const struct netdev *,
-                          odp_port_t, struct tnl_port **);
+                          odp_port_t);
 
-struct tnl_port *tnl_port_add(const struct ofport_dpif *, const struct netdev *,
-                              odp_port_t);
-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_dpif *tnl_port_receive(const struct flow *);
-odp_port_t tnl_port_send(const struct tnl_port *, 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(). */