X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=include%2Fopenvswitch%2Ftunnel.h;h=b9a1c8ea3b5901cdd01e70cd4e56e9673899bca4;hb=28debff598c34799df058f651ed8eb09f56ef00d;hp=5e2e916444a6e4a0cca2a39a80f81598654ca1c1;hpb=007948177581f3b3dad188221593d0e4bdca6ba0;p=openvswitch

diff --git a/include/openvswitch/tunnel.h b/include/openvswitch/tunnel.h
index 5e2e9164..b9a1c8ea 100644
--- a/include/openvswitch/tunnel.h
+++ b/include/openvswitch/tunnel.h
@@ -41,32 +41,33 @@
 #define OPENVSWITCH_TUNNEL_H 1
 
 #include <linux/types.h>
-#include "openvswitch/datapath-protocol.h"
+#include <linux/openvswitch.h>
 
-/* ODP_VPORT_ATTR_OPTIONS attributes for tunnels.
+/* OVS_VPORT_ATTR_OPTIONS attributes for tunnels.
  *
- * ODP_TUNNEL_ATTR_FLAGS and ODP_TUNNEL_ATTR_DST_IPV4 are required.  All other
+ * OVS_TUNNEL_ATTR_FLAGS and OVS_TUNNEL_ATTR_DST_IPV4 are required.  All other
  * attributes are optional.
  */
 enum {
-	ODP_TUNNEL_ATTR_UNSPEC,
-	ODP_TUNNEL_ATTR_FLAGS,    /* 32-bit TNL_F_*. */
-	ODP_TUNNEL_ATTR_DST_IPV4, /* IPv4 destination address. */
-	ODP_TUNNEL_ATTR_SRC_IPV4, /* IPv4 source address. */
-	ODP_TUNNEL_ATTR_OUT_KEY,  /* __be64 key to use on output. */
-	ODP_TUNNEL_ATTR_IN_KEY,   /* __be64 key to match on input. */
-	ODP_TUNNEL_ATTR_TOS,      /* 8-bit TOS value. */
-	ODP_TUNNEL_ATTR_TTL,      /* 8-bit TTL value. */
-	__ODP_TUNNEL_ATTR_MAX
+	OVS_TUNNEL_ATTR_UNSPEC,
+	OVS_TUNNEL_ATTR_FLAGS,    /* 32-bit TNL_F_*. */
+	OVS_TUNNEL_ATTR_DST_IPV4, /* IPv4 destination address. */
+	OVS_TUNNEL_ATTR_SRC_IPV4, /* IPv4 source address. */
+	OVS_TUNNEL_ATTR_OUT_KEY,  /* __be64 key to use on output. */
+	OVS_TUNNEL_ATTR_IN_KEY,   /* __be64 key to match on input. */
+	OVS_TUNNEL_ATTR_TOS,      /* 8-bit TOS value. */
+	OVS_TUNNEL_ATTR_TTL,      /* 8-bit TTL value. */
+	__OVS_TUNNEL_ATTR_MAX
 };
 
-#define ODP_TUNNEL_ATTR_MAX (__ODP_TUNNEL_ATTR_MAX - 1)
+#define OVS_TUNNEL_ATTR_MAX (__OVS_TUNNEL_ATTR_MAX - 1)
 
 #define TNL_F_CSUM		(1 << 0) /* Checksum packets. */
-#define TNL_F_TOS_INHERIT	(1 << 1) /* Inherit the ToS from the inner packet. */
-#define TNL_F_TTL_INHERIT	(1 << 2) /* Inherit the TTL from the inner packet. */
-#define TNL_F_DF_INHERIT	(1 << 3) /* Inherit the DF bit from the inner packet. */
-#define TNL_F_DF_DEFAULT	(1 << 4) /* Set the DF bit if inherit off or not IP. */
+#define TNL_F_TOS_INHERIT	(1 << 1) /* Inherit ToS from inner packet. */
+#define TNL_F_TTL_INHERIT	(1 << 2) /* Inherit TTL from inner packet. */
+#define TNL_F_DF_INHERIT	(1 << 3) /* Inherit DF bit from inner packet. */
+#define TNL_F_DF_DEFAULT	(1 << 4) /* Set DF bit if inherit off or
+					  * not IP. */
 #define TNL_F_PMTUD		(1 << 5) /* Enable path MTU discovery. */
 #define TNL_F_HDR_CACHE		(1 << 6) /* Enable tunnel header caching. */
 #define TNL_F_IPSEC		(1 << 7) /* Traffic is IPsec encrypted. */