patch-2.1.8 linux/net/core/dev.c

• Lines: 75
• Date: Wed Nov 6 14:41:20 1996
• Orig file: v2.1.7/linux/net/core/dev.c
• Orig date: Fri Nov 1 17:13:19 1996

diff -u --recursive --new-file v2.1.7/linux/net/core/dev.c linux/net/core/dev.c
@@ -45,6 +45,7 @@
  *		Alan Cox	:	Cleaned up the backlog initialise.
  *		Craig Metz	:	SIOCGIFCONF fix if space for under
  *					1 device.
+ *		Molnar Ingo	:	skb->stamp hack for the Pentium
  *	    Thomas Bogendoerfer :	Return ENODEV for dev_open, if there
  *					is no device open function.
  *
@@ -118,14 +119,6 @@
  
 static int backlog_size = 0;
 
-/*
- *	Return the lesser of the two values. 
- */
- 
-static __inline__ unsigned long min(unsigned long a, unsigned long b)
-{
-	return (a < b)? a : b;
-}
 
 
 /******************************************************************************************
@@ -418,6 +411,10 @@
 		/* copy outgoing packets to any sniffer packet handlers */
 		if (dev_nit) {
 			struct packet_type *ptype;
+#ifdef CONFIG_M586
+                        struct timeval dummy_tv;
+			do_gettimeofday( &dummy_tv );
+#endif
 			skb->stamp=xtime;
 			for (ptype = ptype_all; ptype!=NULL; ptype = ptype->next) 
 			{
@@ -489,7 +486,13 @@
 	skb->sk = NULL;
 	skb->free = 1;
 	if(skb->stamp.tv_sec==0)
+	{
+#ifdef CONFIG_M586
+                        struct timeval dummy_tv;
+			do_gettimeofday( &dummy_tv );
+#endif
 		skb->stamp = xtime;
+	}
 
 	/*
 	 *	Check that we aren't overdoing things.
@@ -1074,7 +1077,7 @@
 			goto rarok;
 	
 		case SIOCSIFADDR:	/* Set interface address (and family) */
-		
+
 			/*
 			 *	BSDism. SIOCSIFADDR family=AF_UNSPEC sets the
 			 *	physical address. We can cope with this now.
@@ -1107,7 +1110,7 @@
 
 #ifdef CONFIG_NET_ALIAS
 			  	if (net_alias_is(dev))
-			    	net_alias_dev_rehash(dev ,&ifr.ifr_addr);
+				    	net_alias_dev_rehash(dev ,&ifr.ifr_addr);
 #endif
 				dev->pa_addr = new_pa_addr;
 				dev->family = new_family;
@@ -1204,7 +1207,7 @@
 				return -EINVAL;
 
 			if (dev->change_mtu)
-				ret = (*dev->change_mtu)(dev, ifr.ifr_mtu);
+				ret = dev->change_mtu(dev, ifr.ifr_mtu);
 			else
 			{
 				dev->mtu = ifr.ifr_mtu;