patch-2.1.25 linux/drivers/net/tunnel.c

• Lines: 59
• Date: Sun Feb 2 15:18:42 1997
• Orig file: v2.1.24/linux/drivers/net/tunnel.c
• Orig date: Thu Jan 23 21:06:49 1997

diff -u --recursive --new-file v2.1.24/linux/drivers/net/tunnel.c linux/drivers/net/tunnel.c
@@ -120,13 +120,13 @@
 
 static int tunnel_xmit(struct sk_buff *skb, struct device *dev)
 {
-	struct enet_statistics *stats;		/* This device's statistics */
+	struct net_device_stats *stats;		/* This device's statistics */
 	struct rtable *rt;     			/* Route to the other host */
 	struct device *tdev;			/* Device to other host */
 	struct iphdr  *iph;			/* Our new IP header */
 	int    max_headroom;			/* The extra header space needed */
 
-	stats = (struct enet_statistics *)dev->priv;
+	stats = (struct net_device_stats *)dev->priv;
   
 	/*
 	 *  First things first.  Look up the destination address in the 
@@ -194,6 +194,8 @@
 	iph->id			=	htons(ip_id_count++);	/* Race condition here? */
 	ip_send_check(iph);
 
+	stats->tx_bytes+=skb->len;
+	
 	ip_send(skb);
 
 	/* Record statistics and return */
@@ -201,9 +203,9 @@
 	return 0;
 }
 
-static struct enet_statistics *tunnel_get_stats(struct device *dev)
+static struct net_device_stats *tunnel_get_stats(struct device *dev)
 {
-	return((struct enet_statistics*) dev->priv);
+	return((struct net_device_stats*) dev->priv);
 }
 
 /*
@@ -226,10 +228,10 @@
 	dev->stop		= tunnel_close;
 	dev->hard_start_xmit	= tunnel_xmit;
 	dev->get_stats		= tunnel_get_stats;
-	dev->priv = kmalloc(sizeof(struct enet_statistics), GFP_KERNEL);
+	dev->priv = kmalloc(sizeof(struct net_device_stats), GFP_KERNEL);
 	if (dev->priv == NULL)
 		return -ENOMEM;
-	memset(dev->priv, 0, sizeof(struct enet_statistics));
+	memset(dev->priv, 0, sizeof(struct net_device_stats));
 
 	/* Initialize the tunnel device structure */
 	
@@ -302,7 +304,7 @@
 void cleanup_module(void)
 {
 	unregister_netdev(&dev_tunnel);
-	kfree_s(dev_tunnel.priv,sizeof(struct enet_statistics));
+	kfree_s(dev_tunnel.priv,sizeof(struct net_device_stats));
 	dev_tunnel.priv=NULL;
 }
 #endif /* MODULE */