patch-2.3.99-pre3 linux/drivers/net/tlan.c

• Lines: 44
• Date: Wed Mar 22 09:38:14 2000
• Orig file: v2.3.99-pre2/linux/drivers/net/tlan.c
• Orig date: Sun Feb 20 21:12:39 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/net/tlan.c linux/drivers/net/tlan.c
@@ -66,6 +66,12 @@
  *	                       network cleanup in 2.3.43pre7 (Tigran & myself)
  *	                     - Minor stuff.
  *
+ *	v1.5 March 22, 2000  - Fixed another timer bug that would hang the driver
+ *			       if no cable/link were present.
+ *			     - Cosmetic changes.
+ *			     - TODO: Port completely to new PCI/DMA API
+ *			     	     Auto-Neg fallback.
+ *
  *******************************************************************************/
 
 
@@ -106,7 +112,7 @@
 static	u8		*TLanPadBuffer;
 static	char		TLanSignature[] = "TLAN";
 static	int		TLanVersionMajor = 1;
-static	int		TLanVersionMinor = 4;
+static	int		TLanVersionMinor = 5;
 
 
 static TLanAdapterEntry TLanAdapterList[] __initdata = {
@@ -430,7 +436,8 @@
 
 	}
 	
-	printk(KERN_INFO "TLAN: %d device(s) installed\n", TLanDevicesInstalled);
+	printk(KERN_INFO "TLAN: %d device%s installed\n", 
+		 TLanDevicesInstalled, TLanDevicesInstalled == 1 ? "" : "s");
 	
 	return ((TLanDevicesInstalled > 0) ? 0 : -ENODEV);
 }
@@ -839,8 +846,10 @@
 
 	TLan_ReadAndClearStats( dev, TLAN_RECORD );
 	outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
-	if ( priv->timer.function != NULL )
+	if ( priv->timer.function != NULL ) {
 		del_timer( &priv->timer );
+		priv->timer.function = NULL;
+	}
 	free_irq( dev->irq, dev );
 	TLan_FreeLists( dev );
 	TLAN_DBG( TLAN_DEBUG_GNRL, "Device %s closed.\n", dev->name );