patch-1.3.78 linux/drivers/net/new_tunnel.c

• Lines: 58
• Date: Mon Mar 25 08:58:21 1996
• Orig file: v1.3.77/linux/drivers/net/new_tunnel.c
• Orig date: Wed Mar 13 10:09:18 1996

diff -u --recursive --new-file v1.3.77/linux/drivers/net/new_tunnel.c linux/drivers/net/new_tunnel.c
@@ -273,8 +273,9 @@
 	/*
 	 *	Push down and install the IPIP header.
 	 */
-	iph = skb->h.iph;
-	iph->version	= 	4;
+	 
+	iph 			=	skb->h.iph;
+	iph->version		= 	4;
 	iph->tos		=	skb->ip_hdr->tos;
 	iph->ttl		=	skb->ip_hdr->ttl;
 	iph->frag_off		=	0;
@@ -285,8 +286,8 @@
 	iph->tot_len		=	htons(skb->len);
 	iph->id			=	htons(ip_id_count++);	/* Race condition here? */
 	ip_send_check(iph);
-	skb->ip_hdr = skb->h.iph;
-
+	skb->ip_hdr 		= skb->h.iph;
+	skb->protocol		=	htons(ETH_P_IP);
 #ifdef TUNNEL_DEBUG
 	printk("New IP Header....\n");
 	print_ip(iph);
@@ -317,8 +318,7 @@
 	return 0;
 }
 
-static struct enet_statistics *
-tunnel_get_stats(struct device *dev)
+static struct enet_statistics *tunnel_get_stats(struct device *dev)
 {
 	return((struct enet_statistics*) dev->priv);
 }
@@ -336,7 +336,7 @@
 	static int tun_msg=0;
 	if(!tun_msg)
 	{
-		printk ( KERN_INFO "tunnel: version v0.2b\n" );
+		printk ( KERN_INFO "tunnel: version v0.2b2\n" );
 		tun_msg=1;
 	}
 
@@ -393,11 +393,13 @@
 	return 0;
 }
 
-static struct device dev_tunnel = {
+static struct device dev_tunnel = 
+{
 	"tunl0\0   ", 
 	0, 0, 0, 0,
  	0x0, 0,
- 	0, 0, 0, NULL, tunnel_probe };
+ 	0, 0, 0, NULL, tunnel_probe 
+ };
 
 int init_module(void)
 {