From 5c2a959a72e999b5aedf34b416960260d272a9df Mon Sep 17 00:00:00 2001 From: Leendert van Doorn Date: Fri, 10 Jun 2016 08:54:25 -0500 Subject: [PATCH] [tg3] Fix address truncation bug on 64-bit machines Signed-off-by: Leendert van Doorn Signed-off-by: Michael Brown --- src/drivers/net/tg3/tg3.c | 2 +- src/drivers/net/tg3/tg3.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/net/tg3/tg3.c b/src/drivers/net/tg3/tg3.c index 42bfa2d99..824c9b1c0 100644 --- a/src/drivers/net/tg3/tg3.c +++ b/src/drivers/net/tg3/tg3.c @@ -545,7 +545,7 @@ static int tg3_test_dma(struct tg3 *tp) goto out_nofree; } buf_dma = virt_to_bus(buf); - DBGC2(tp->dev, "dma test buffer, virt: %p phys: %#08x\n", buf, buf_dma); + DBGC2(tp->dev, "dma test buffer, virt: %p phys: %#016lx\n", buf, buf_dma); if (tg3_flag(tp, 57765_PLUS)) { tp->dma_rwctrl = DMA_RWCTRL_DIS_CACHE_ALIGNMENT; diff --git a/src/drivers/net/tg3/tg3.h b/src/drivers/net/tg3/tg3.h index 0c3d23bb7..be02c5719 100644 --- a/src/drivers/net/tg3/tg3.h +++ b/src/drivers/net/tg3/tg3.h @@ -2788,7 +2788,7 @@ struct tg3_hw_stats { u8 __reserved4[0xb00-0x9c8]; }; -typedef u32 dma_addr_t; +typedef unsigned long dma_addr_t; /* 'mapping' is superfluous as the chip does not write into * the tx/rx post rings so we could just fetch it from there.