Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 40 insertions, 0 deletions

diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
new file mode 100644
index 000000000000..29c9da707c7a
--- /dev/null
+++ b/include/net/ip6_tunnel.h
@@ -0,0 +1,40 @@
+/*
+ * $Id$
+ */
+
+#ifndef _NET_IP6_TUNNEL_H
+#define _NET_IP6_TUNNEL_H
+
+#include <linux/ipv6.h>
+#include <linux/netdevice.h>
+#include <linux/ip6_tunnel.h>
+
+/* capable of sending packets */
+#define IP6_TNL_F_CAP_XMIT 0x10000
+/* capable of receiving packets */
+#define IP6_TNL_F_CAP_RCV 0x20000
+
+#define IP6_TNL_MAX 128
+
+/* IPv6 tunnel */
+
+struct ip6_tnl {
+        struct ip6_tnl *next;   /* next tunnel in list */
+        struct net_device *dev; /* virtual device associated with tunnel */
+        struct net_device_stats stat;   /* statistics for tunnel device */
+        int recursion;          /* depth of hard_start_xmit recursion */
+        struct ip6_tnl_parm parms;      /* tunnel configuration paramters */
+        struct flowi fl;        /* flowi template for xmit */
+        struct dst_entry *dst_cache;    /* cached dst */
+        u32 dst_cookie;
+};
+
+/* Tunnel encapsulation limit destination sub-option */
+
+struct ipv6_tlv_tnl_enc_lim {
+        __u8 type;              /* type-code for option         */
+        __u8 length;            /* option length                */
+        __u8 encap_limit;       /* tunnel encapsulation limit   */
+} __attribute__ ((packed));
+
+#endif