Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4d5900a authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

starfire: Fix dma_addr_t size test for MIPS 



Commit 56543af9 "starfire: use BUILD_BUG_ON for netdrv_addr_t" revealed
that the preprocessor condition used to find the size of dma_addr_t
yielded the wrong result for some architectures and configurations.
This was kluged for 64-bit PowerPC in commit 3e502e63 by adding yet
another case to the condition.  However, 64-bit MIPS configurations
are not detected reliably either.

This should be fixed by using CONFIG_ARCH_DMA_ADDR_T_64BIT, but that
isn't yet defined everywhere it should be.

Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 824f5f38

drivers/net/starfire.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int full_duplex[MAX_UNITS] = {0, }; 
 * This SUCKS.

 * We need a much better method to determine if dma_addr_t is 64-bit.

 */

#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || defined(__mips64__) || (defined(__mips__) && defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) || (defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT))

#if (defined(__i386__) && defined(CONFIG_HIGHMEM64G)) || defined(__x86_64__) || defined (__ia64__) || defined(__alpha__) || (defined(CONFIG_MIPS) && ((defined(CONFIG_HIGHMEM) && defined(CONFIG_64BIT_PHYS_ADDR)) || defined(CONFIG_64BIT))) || (defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT))

/* 64-bit dma_addr_t */

#define ADDR_64BITS	/* This chip uses 64 bit addresses. */

#define netdrv_addr_t __le64