Global replace of Nicira Networks.

[sliver-openvswitch.git] / include / openvswitch / tunnel.h

diff --git a/include/openvswitch/tunnel.h b/include/openvswitch/tunnel.h
index 110e652..c494791 100644 (file)
--- a/include/openvswitch/tunnel.h
+++ b/include/openvswitch/tunnel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira, Inc.
  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is
@@ -63,10 +63,11 @@ enum {
 #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. */