diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2007-05-01 16:33:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-04 20:59:07 -0400 |
commit | 8b6aaab8c8bdbe011aac79af218dd1e657984bab (patch) | |
tree | 305eef4f02710d6a38c987000538ff183ae2cbd2 /drivers/net/Kconfig | |
parent | 0251c38ce503de01f5bc07917a824021b86b4ada (diff) |
m68k: macmace fixes
Fix a race condition in the transmit code, where the dma interrupt could update
the free tx buffer count concurrently and wedge the tx queue.
Fix the misuse of the rx frame status and rx frame length registers: no more
"fifo overrun" errors caused by the OFLOW bit being tested in the frame length
register (instead of the status register), and no more missed packets due to
incorrect length taken from status register (instead of the frame length
register).
Fix a panic (skb_over_panic BUG) caused by allocating and then copying an
incoming packet while the packet length register was changing.
Cut-and-paste the reset code from the powermac mace driver (mace.c), so the NIC
functions when MacOS does not initialise it (important for anyone wanting to
use the Emile boot loader).
Cut-and-paste the error counting and timeout recovery code from mace.c.
Fix over allocation of rx buffer memory (it's page order, not page count).
Converted to driver model.
Converted to DMA API.
Since I've run out of ways to make it fail, and since it performs well now,
promote the driver from EXPERIMENTAL status. Tested on both quadra 840av and
660av.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 092e4cf0743..69dba62e0ba 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -337,8 +337,8 @@ config MACSONIC | |||
337 | be called macsonic. | 337 | be called macsonic. |
338 | 338 | ||
339 | config MACMACE | 339 | config MACMACE |
340 | bool "Macintosh (AV) onboard MACE ethernet (EXPERIMENTAL)" | 340 | bool "Macintosh (AV) onboard MACE ethernet" |
341 | depends on NET_ETHERNET && MAC && EXPERIMENTAL | 341 | depends on NET_ETHERNET && MAC |
342 | select CRC32 | 342 | select CRC32 |
343 | help | 343 | help |
344 | Support for the onboard AMD 79C940 MACE Ethernet controller used in | 344 | Support for the onboard AMD 79C940 MACE Ethernet controller used in |