Re: [Fwd: 2.6.10-rc3: tulip-driver: tulip_stop_rxtx() failed]

[Grant Grundler]

On Tue, Dec 14, 2004 at 07:57:22PM -0500, John W. Linville wrote:
> On Sun, Dec 12, 2004 at 08:59:36PM -0700, Grant Grundler wrote:
> 
> > But still, I'm hopeing for two code changes as a result:
> > 1) include CSR5 and CSR6 in the printk output
> > 2) the date of the tulip driver revision needs to be updated (or dropped).
> 
> Patches?

Sorry...appended below.

> If you don't want to post them publicly yourself, send them to me
> and I'll be happy to test/package/post them...

Thanks!
But I don't mind posting them...I just spaced out and send the first bit
to jgarzik directly instead of "reply all".

Commit Log:
	add CSR5 and CSR6 output to debug tulip_stop_rxtx failures.
	Update version release date

Signed-off-by:
	Grant Grundler <grundler@xxxxxxxxxxxxxxxx>

thanks,
grant

Index: drivers/net/tulip/tulip.h
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/net/tulip/tulip.h,v
retrieving revision 1.11
diff -u -p -r1.11 tulip.h
--- drivers/net/tulip/tulip.h	4 Dec 2004 07:02:42 -0000	1.11
+++ drivers/net/tulip/tulip.h	12 Dec 2004 21:51:43 -0000
@@ -474,8 +474,11 @@ static inline void tulip_stop_rxtx(struc
 			udelay(10);
 
 		if (!i)
-			printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed\n",
-					tp->pdev->slot_name);
+			printk(KERN_DEBUG "%s: tulip_stop_rxtx() failed"
+					" (CSR5 0x%x CSR6 0x%x)\n",
+					tp->pdev->slot_name,
+					ioread32(ioaddr + CSR5),
+					ioread32(ioaddr + CSR6));
 	}
 }
 

Index: drivers/net/tulip/tulip_core.c
===================================================================
RCS file: /var/cvs/linux-2.6/drivers/net/tulip/tulip_core.c,v
retrieving revision 1.24
diff -u -p -r1.24 tulip_core.c
--- drivers/net/tulip/tulip_core.c	4 Dec 2004 07:02:42 -0000	1.24
+++ drivers/net/tulip/tulip_core.c	15 Dec 2004 17:18:39 -0000
@@ -22,7 +22,7 @@
 #else
 #define DRV_VERSION	"1.1.13"
 #endif
-#define DRV_RELDATE	"May 11, 2002"
+#define DRV_RELDATE	"December 15, 2004"
 
 
 #include <linux/module.h>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/