git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
ofproto
/
tunnel.h
diff --git
a/ofproto/tunnel.h
b/ofproto/tunnel.h
index
f175f1a
..
27a2f7d
100644
(file)
--- a/
ofproto/tunnel.h
+++ b/
ofproto/tunnel.h
@@
-20,9
+20,6
@@
#include <stdint.h>
#include "flow.h"
#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
/* Tunnel port emulation layer.
*
* These functions emulate tunnel virtual ports based on the outer
@@
-39,6
+36,8
@@
void tnl_port_add(const struct ofport_dpif *, const struct netdev *,
void tnl_port_del(const struct ofport_dpif *);
const struct ofport_dpif *tnl_port_receive(const struct flow *);
void tnl_port_del(const struct ofport_dpif *);
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);
odp_port_t tnl_port_send(const struct ofport_dpif *, struct flow *,
struct flow_wildcards *wc);