patch-2.1.68 linux/include/net/ipip.h

Next file: linux/include/net/netlink.h
Previous file: linux/include/net/ipconfig.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.67/linux/include/net/ipip.h linux/include/net/ipip.h
@@ -1,8 +1,33 @@
 #ifndef __NET_IPIP_H
 #define __NET_IPIP_H 1
 
-extern void ipip_err(struct sk_buff *skb, unsigned char*);
-extern int ipip_rcv(struct sk_buff *skb, unsigned short len);
-                                   
+#include <linux/if_tunnel.h>
+
+/* Keep error state on tunnel for 30 sec */
+#define IPTUNNEL_ERR_TIMEO	(30*HZ)
+
+struct ip_tunnel
+{
+	struct ip_tunnel	*next;
+	struct device		*dev;
+	struct net_device_stats	stat;
+
+	int			recursion;	/* Depth of hard_start_xmit recursion */
+	int			err_count;	/* Number of arrived ICMP errors */
+	unsigned long		err_time;	/* Time when the last ICMP error arrived */
+
+	/* These four fields used only by GRE */
+	__u32			i_seqno;	/* The last seen seqno	*/
+	__u32			o_seqno;	/* The last output seqno */
+	int			hlen;		/* Precalculated GRE header length */
+	int			mlink;
+
+	struct ip_tunnel_parm	parms;
+};
+
+extern int	ipip_init(void);
+extern int	ipgre_init(void);
+extern int	sit_init(void);
+extern void	sit_cleanup(void);
 
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov