projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vonn: Allow snoops to use the OpenFlow version of the controller connection
[openvswitch]
/
include
/
openvswitch
/
tunnel.h
diff --git
a/include/openvswitch/tunnel.h
b/include/openvswitch/tunnel.h
index b9a1c8ea3b5901cdd01e70cd4e56e9673899bca4..42c36217d3dcc15cfb387159edf0d461f680f9f6 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
*
* 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
@@
-68,8
+68,8
@@
enum {
#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_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. */
+/* Bit 6 is reserved since it was previously used for Tunnel header caching. */
#define TNL_F_PMTUD (1 << 5) /* Enable path MTU discovery. */
#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. */
#endif /* openvswitch/tunnel.h */
#define TNL_F_IPSEC (1 << 7) /* Traffic is IPsec encrypted. */
#endif /* openvswitch/tunnel.h */