[PATCH 2.6.4-rc2-bk4 2/2] pcnet32 use netif_msg_init

[PATCH 2.6.4-rc2-bk4 2/2] pcnet32 use netif_msg_init

[Don Fry]

Please apply this patch to 2.6.4-rc2-bk4 after the patch to add
the netif_msg_init helper to netdevice.h  (sent Friday 3/5/04
[PATCH 2.4.26-pre2] netdevice.h: add netif_msg_init helper)

This patch uses the netif_msg_init routine to initialize the
debug message level for the pcnet32 driver.  Tested IA32.

--- linux-2.6.4-rc2-bk4/drivers/net/hang.pcnet32.c	Mon Mar  8 11:25:32 2004
+++ linux-2.6.4-rc2-bk4/drivers/net/pcnet32.c	Mon Mar  8 11:26:01 2004
@@ -225,10 +225,13 @@
  * v1.27b  Sep 30 2002 Kent Yoder <yoder1@us.ibm.com>
  * 	   Added timer for cable connection state changes.
  * v1.28   20 Feb 2004 Don Fry <brazilnut@us.ibm.com>
- *	   Jon Lewis <jonmason@us.ibm.com>, Chinmay Albal <albal@in.ibm.com>
+ *	   Jon Mason <jonmason@us.ibm.com>, Chinmay Albal <albal@in.ibm.com>
  *	   Now uses ethtool_ops, netif_msg_* and generic_mii_ioctl.
  *	   Fixes bogus 'Bus master arbitration failure', pci_[un]map_single
  *	   length errors, and transmit hangs.  Cleans up after errors in open.
+ *	   Jim Lewis <jklewis@us.ibm.com> added ethernet loopback test.
+ *	   Thomas Munck Steenholdt <tmus@tmus.dk> non-mii ioctl corrections.
+ *	   Uses netif_msg_init Don Fry.
  */
 
 
@@ -2013,8 +2016,7 @@
 {
     printk(KERN_INFO "%s", version);
 
-    if (debug >= 0 && debug < (sizeof(int) - 1))
-	pcnet32_debug = 1 << debug;
+    pcnet32_debug = netif_msg_init(debug, 0);
 
     if ((tx_start_pt >= 0) && (tx_start_pt <= 3))
 	tx_start = tx_start_pt;



-- 
Don Fry
brazilnut@us.ibm.com

Re: [PATCH 2.6.4-rc2-bk4 2/2] pcnet32 use netif_msg_init

[Jeff Garzik]

Don Fry wrote:
> @@ -2013,8 +2016,7 @@
>  {
>      printk(KERN_INFO "%s", version);
>  
> -    if (debug >= 0 && debug < (sizeof(int) - 1))
> -	pcnet32_debug = 1 << debug;
> +    pcnet32_debug = netif_msg_init(debug, 0);


Do you really want to default to silence?  IMO define a 
PCNET32_DEF_MSG_ENABLE with a few of the critical bits like probe-time 
information.

	Jeff