aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/spider_net.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2006-01-12 17:16:43 -0500
committerJeff Garzik <jgarzik@pobox.com>2006-01-17 07:25:00 -0500
commit8e0a613bf61ccaab376877d7c2ed50315b8ca6d7 (patch)
tree76964e5d482023c895487a7392a3e3e18d7dc599 /drivers/net/spider_net.h
parent030d6753f8b6251927330431a7e5f0ac86bc6da9 (diff)
[PATCH] spidernet: fix HW structures for 64 bit dma_addr_t
The driver incorrectly used dma_addr_t to describe HW structures and consequently broke when that type was changed in 2.6.15-rc. This changed spidernet to use u32 for 32 bit HW defined structure elements. From: Jens Osterkamp <Jens.Osterkamp@de.ibm.com> Signed-off-by: Jens Osterkamp <Jens.Osterkamp@de.ibm.com> Signed-off-by: Arnd Bergmann <arndb@de.ibm.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/net/spider_net.h')
-rw-r--r--drivers/net/spider_net.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index 22b2f2347351..98f11ecf48fc 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -373,9 +373,9 @@ enum spider_net_descr_status {
373 373
374struct spider_net_descr { 374struct spider_net_descr {
375 /* as defined by the hardware */ 375 /* as defined by the hardware */
376 dma_addr_t buf_addr; 376 u32 buf_addr;
377 u32 buf_size; 377 u32 buf_size;
378 dma_addr_t next_descr_addr; 378 u32 next_descr_addr;
379 u32 dmac_cmd_status; 379 u32 dmac_cmd_status;
380 u32 result_size; 380 u32 result_size;
381 u32 valid_size; /* all zeroes for tx */ 381 u32 valid_size; /* all zeroes for tx */