mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
Subsystems (2)
PATCH 1/2 mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
From: Dale Farnsworth <[email protected]>
No 64-bit PPC_MULTIPLATFORM platforms use the mv643xx_eth driver, so build it only on PPC32.
Signed-off-by Dale Farnsworth <[email protected]>
Acked-by Sven Luther <[email protected]>
drivers/net/Kconfig +1 -1
@@ -2262,7 +2262,7 @@ config UGETH_HAS_GIGA config MV643XX_ETH tristate "MV-643XX Ethernet support" - depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || PPC_MULTIPLATFORM + depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) select MII help This driver supports the gigabit Ethernet on the Marvell MV643XX
PATCH 2/2 mv643xx_eth: Fix typo: RX_SKB_SIZE ==> ETH_RX_SKB_SIZE
From: Dale Farnsworth <[email protected]>
Bug was introduced in commit 71d28725548be203e8b8f6ad63b1f64fd7f02d4d. How embarrassing. It wasn't caught because dma_umap_single() is defined away on arch/ppc and 32-bit arch/powerpc.
Signed-off-by Dale Farnsworth <[email protected]>
---
Arggh. (And that's not pirate talk.)
This isn't urgent since dma_unmap_single() is defined away for ppc32 both in arch/ppc and arch/powerpc. It was caught on ppc64 arch/powerpc, but isn't needed by any ppc64 platforms.
drivers/net/mv643xx_eth.c +1 -1
@@ -385,7 +385,7 @@ static int mv643xx_eth_receive_queue(strstruct pkt_info pkt_info;while (budget-- >0 &ð_port_receive (mp, &pkt_info) ==ETH_OK ) { -dma_unmap_single (NULL , pkt_info.buf_ptr,RX_SKB_SIZE , +dma_unmap_single (NULL , pkt_info.buf_ptr,ETH_RX_SKB_SIZE ,DMA_FROM_DEVICE ); mp->rx_desc_count--; received_packets++;