X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fopenvswitch%2Ftunnel.h;h=44facfae6cc10b423e74ce6d9c944d388ef0dccc;hb=51d4d59822785c1044cd96e6c73427347e0154c2;hp=dd700d0dc006960a7e49d44600c55c68523a8314;hpb=842cf6f472b236b6e61be04b41970116245b1759;p=sliver-openvswitch.git

diff --git a/include/openvswitch/tunnel.h b/include/openvswitch/tunnel.h
index dd700d0dc..44facfae6 100644
--- a/include/openvswitch/tunnel.h
+++ b/include/openvswitch/tunnel.h
@@ -41,6 +41,7 @@
 #define OPENVSWITCH_TUNNEL_H 1
 
 #include <linux/types.h>
+#include "openvswitch/datapath-protocol.h"
 
 #define TNL_F_CSUM		(1 << 1) /* Checksum packets. */
 #define TNL_F_IN_KEY_MATCH	(1 << 2) /* Store the key in tun_id to match in flow table. */
@@ -49,15 +50,17 @@
 #define TNL_F_TTL_INHERIT	(1 << 5) /* Inherit the TTL from the inner packet. */
 #define TNL_F_PMTUD		(1 << 6) /* Enable path MTU discovery. */
 #define TNL_F_HDR_CACHE		(1 << 7) /* Enable tunnel header caching. */
+#define TNL_F_IPSEC		(1 << 8) /* Traffic is IPsec encrypted. */
 
+/* This goes in the "config" member of struct odp_port for tunnel vports. */
 struct tnl_port_config {
-	__u32	flags;
-	__be32	saddr;
-	__be32	daddr;
-	__be32	in_key;
-	__be32	out_key;
-	__u8	tos;
-	__u8	ttl;
+	__aligned_be64	in_key;
+	__aligned_be64	out_key;
+	__u32		flags;
+	__be32		saddr;
+	__be32		daddr;
+	__u8		tos;
+	__u8		ttl;
 };
 
 #endif /* openvswitch/tunnel.h */