Please apply this patch to 2.4.26 after the preceeding patch to
add the netif_msg_init helper to netdevice.h
This patch uses the netif_msg_init routine to initialize the
debug message level for the pcnet32 driver.
--- orig.linux-2.4.26-pre2/drivers/net/pcnet32.c Mon Mar 8 10:07:05 2004
+++ linux-2.4.26-pre2/drivers/net/pcnet32.c Mon Mar 8 10:22:32 2004
@@ -224,10 +224,13 @@
* FD auto negotiate error workaround for xSeries250
* clean up and using new mii module
* v1.28 20 Feb 2004 Don Fry <brazilnut@xxxxxxxxxx>
- * Jon Lewis <jonmason@xxxxxxxxxx>, Chinmay Albal <albal@xxxxxxxxxx>
+ * Jon Mason <jonmason@xxxxxxxxxx>, Chinmay Albal <albal@xxxxxxxxxx>
* 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@xxxxxxxxxx> added ethernet loopback test.
+ * Thomas Munck Steenholdt <tmus@xxxxxxx> non-mii ioctl corrections.
+ * Uses netif_msg_init Don Fry.
*/
@@ -1949,8 +1952,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@xxxxxxxxxx
|