2.6.x net driver fixes

PATCH New Jeff Garzik 1 participant 1 message Jan 27, 2005

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Jeff Garzik

author

2005-01-27 23:45 UTC #0 lore raw

PATCH 1/1 2.6.x net driver fixes

Please do a

bk pull bk://gkernel.bkbits.net/net-drivers-2.6

This will update the following files:

 drivers/net/e100.c          |    1 
 drivers/net/gianfar.c       |    8 +--
 drivers/net/skfp/skfddi.c   |  116 ++++++++++++++++++--------------------------
 drivers/net/tulip/de2104x.c |    1 
 4 files changed, 56 insertions(+), 70 deletions(-)

through these ChangeSets:

<galak:freescale.com>:
o netdrv gianfar: Fix usage of gfar_read in debug code

Alexander Viro:
o de2104x: Fixes breakage in getting MAC address

Stephen Hemminger:
o (2/2) skfddi: netdev_priv and cast cleanup
o (1/2) skfddi: initialization

Steven Rostedt:
o e100 locking up netconsole

drivers/net/e100.c +1 -0

diff -Nru a/drivers/net/e100.c b/drivers/net/e100.c
@@ -1630,6 +1630,7 @@
 	struct nic *nic = netdev_priv(netdev);
 	e100_disable_irq(nic);
 	e100_intr(nic->pdev->irq, netdev, NULL);
+	e100_tx_clean(nic);
 	e100_enable_irq(nic);
 }
 #endif

drivers/net/gianfar.c +4 -4

diff -Nru a/drivers/net/gianfar.c b/drivers/net/gianfar.c
@@ -1190,8 +1190,8 @@
 	} else {
 #ifdef VERBOSE_GFAR_ERRORS
 		printk(KERN_DEBUG "%s: receive called twice (%x)[%x]\n",
-		       dev->name, gfar_read(priv->regs->ievent),
-		       gfar_read(priv->regs->imask));
+		       dev->name, gfar_read(&priv->regs->ievent),
+		       gfar_read(&priv->regs->imask));
 #endif
 	}
 #else

@@ -1415,7 +1415,7 @@
 
 #ifdef VERBOSE_GFAR_ERRORS
 		printk(KERN_DEBUG "%s: busy error (rhalt: %x)\n", dev->name,
-		       gfar_read(priv->regs->rstat));
+		       gfar_read(&priv->regs->rstat));
 #endif
 	}
 	if (events & IEVENT_BABR) {

@@ -1793,7 +1793,7 @@
 
 #ifdef VERBOSE_GFAR_ERRORS
 		printk(KERN_DEBUG "%s: busy error (rhalt: %x)\n", dev->name,
-		       gfar_read(priv->regs->rstat));
+		       gfar_read(&priv->regs->rstat));
 #endif
 	}
 	if (events & IEVENT_BABR) {

drivers/net/skfp/skfddi.c +50 ~~-66~~

313 lines not on this page · raw message

drivers/net/tulip/de2104x.c +1 -0

diff -Nru a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
@@ -1703,6 +1703,7 @@
 			value = dr32(ROMCmd);
 		while (value < 0 && --boguscnt > 0);
 		de->dev->dev_addr[i] = value;
+		udelay(1);
 		if (boguscnt <= 0)
 			printk(KERN_WARNING PFX "timeout reading 21040 MAC address byte %u\n", i);
 	}