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

Next file: linux/net/ipv4/arp.c
Previous file: linux/net/ax25/sysctl_net_ax25.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.8/linux/net/core/dev.c linux/net/core/dev.c
@@ -45,7 +45,6 @@
  *		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.
  *
@@ -411,11 +410,9 @@
 		/* 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;
+
+			get_fast_time(&skb->stamp);
+
 			for (ptype = ptype_all; ptype!=NULL; ptype = ptype->next) 
 			{
 				/* Never send packets back to the socket
@@ -486,13 +483,7 @@
 	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;
-	}
+		get_fast_time(&skb->stamp);
 
 	/*
 	 *	Check that we aren't overdoing things.
@@ -1369,6 +1360,7 @@
 extern int lance_init(void);
 extern int ni65_init(void);
 extern int pi_init(void);
+extern int bpq_init(void);
 extern int scc_init(void);
 extern void sdla_setup(void);
 extern void dlci_setup(void);
@@ -1419,6 +1411,9 @@
 #endif
 #if defined(CONFIG_PT)
 	pt_init();
+#endif
+#if defined(CONFIG_BPQETHER)
+	bpq_init();
 #endif
 #if defined(CONFIG_DLCI)
 	dlci_setup();

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