git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
[pandora-kernel.git]
/
include
/
linux
/
if_tunnel.h
diff --git
a/include/linux/if_tunnel.h
b/include/linux/if_tunnel.h
index
660b501
..
228eb4e
100644
(file)
--- a/
include/linux/if_tunnel.h
+++ b/
include/linux/if_tunnel.h
@@
-17,6
+17,9
@@
#define GRE_FLAGS __constant_htons(0x00F8)
#define GRE_VERSION __constant_htons(0x0007)
+/* i_flags values for SIT mode */
+#define SIT_ISATAP 0x0001
+
struct ip_tunnel_parm
{
char name[IFNAMSIZ];