summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDustin Marquess2007-08-10 23:05:15 +0200
committerJeff Garzik2007-08-14 07:27:10 +0200
commitb47157f00414f368f2847697ce48b76f1a5e5110 (patch)
tree6c3d65b1ccf1f8cdce32ebb205e9cb3d1ebbb55a
parentLinux 2.6.23-rc3 (diff)
downloadkernel-qcow2-linux-b47157f00414f368f2847697ce48b76f1a5e5110.tar.gz
kernel-qcow2-linux-b47157f00414f368f2847697ce48b76f1a5e5110.tar.xz
kernel-qcow2-linux-b47157f00414f368f2847697ce48b76f1a5e5110.zip
via-rhine: disable rx_copybreak on archs that don't allow unaligned DMA access
Patch to disable the rx_copybreak feature on hardware architectures that don't allow unaligned DMA access. #ifdef code taken from tulip_core.c. Problem pointed out by Ivan Kokshaysky. Signed-off-by: Dustin Marquess <jailbird@alcatraz.fdf.net> Cc: Francois Romieu <romieu@fr.zoreil.com> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/via-rhine.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index c3fe230695a0..b56dff26772d 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -42,7 +42,13 @@ static int max_interrupt_work = 20;
/* Set the copy breakpoint for the copy-only-tiny-frames scheme.
Setting to > 1518 effectively disables this feature. */
+#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \
+ || defined(CONFIG_SPARC) || defined(__ia64__) \
+ || defined(__sh__) || defined(__mips__)
+static int rx_copybreak = 1518;
+#else
static int rx_copybreak;
+#endif
/* Work-around for broken BIOSes: they are unable to get the chip back out of
power state D3 so PXE booting fails. bootparam(7): via-rhine.avoid_D3=1 */