## Automatically generated incremental diff
## From:   linux-2.2.24-rc1
## To:     linux-2.2.24-rc2
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.2.24-rc1/Makefile linux-2.2.24-rc2/Makefile
--- linux-2.2.24-rc1/Makefile	Thu Dec 19 16:38:13 2002
+++ linux-2.2.24-rc2/Makefile	Thu Dec 19 16:38:14 2002
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 2
 SUBLEVEL = 24
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 
 ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
 
diff -urN linux-2.2.24-rc1/arch/i386/kernel/setup.c linux-2.2.24-rc2/arch/i386/kernel/setup.c
--- linux-2.2.24-rc1/arch/i386/kernel/setup.c	Thu Dec 19 16:38:13 2002
+++ linux-2.2.24-rc2/arch/i386/kernel/setup.c	Thu Dec 19 16:38:14 2002
@@ -1380,7 +1380,7 @@
 		case X86_VENDOR_AMD:
 			if(init_amd(c))
 				return;
-			return;
+			break;
 
 		case X86_VENDOR_CENTAUR:
 			init_centaur(c);
diff -urN linux-2.2.24-rc1/drivers/net/starfire.c linux-2.2.24-rc2/drivers/net/starfire.c
--- linux-2.2.24-rc1/drivers/net/starfire.c	Mon May 20 16:32:35 2002
+++ linux-2.2.24-rc2/drivers/net/starfire.c	Thu Dec 19 16:38:14 2002
@@ -1046,25 +1046,22 @@
 {
 	struct netdev_private *np = dev->priv;
 	long ioaddr = dev->base_addr;
+	int old_debug;
 
 	printk(KERN_WARNING "%s: Transmit timed out, status %8.8x,"
 	       " resetting...\n", dev->name, (int)readl(ioaddr + IntrStatus));
 
-#ifndef __alpha__
-	{
-		int i;
-		printk(KERN_DEBUG "  Rx ring %p: ", np->rx_ring);
-		for (i = 0; i < RX_RING_SIZE; i++)
-			printk(" %8.8x", (unsigned int)le32_to_cpu(np->rx_ring[i].rxaddr));
-		printk("\n"KERN_DEBUG"  Tx ring %p: ", np->tx_ring);
-		for (i = 0; i < TX_RING_SIZE; i++)
-			printk(" %4.4x", le32_to_cpu(np->tx_ring[i].status));
-		printk("\n");
-	}
-#endif
-
 	/* Perhaps we should reinitialize the hardware here. */
-	/* Stop and restart the chip's Tx processes . */
+
+	/*
+	 * Stop and restart the chip's Tx processes.
+	 * Cheat and increase the debug level temporarily.
+	 */
+	old_debug = debug;
+	debug = 2;
+	netdev_close(dev);
+	netdev_open(dev);
+	debug = old_debug;
 
 	/* Trigger an immediate transmit demand. */
 
@@ -1933,6 +1930,8 @@
 	writel(0, ioaddr + IntrEnable);
 
 	/* Stop the chip's Tx and Rx processes. */
+	writel(0, ioaddr + GenCtrl);
+	readl(ioaddr + GenCtrl);
 
 #ifdef __i386__
 	if (debug > 2) {
