From: Michael Chan <mchan@broadcom.com>
Date: Tue, 28 Mar 2006 07:16:49 +0000 (-0800)
Subject: [TG3]: Fix bug in 40-bit DMA workaround code
X-Git-Tag: v2.6.17-rc1~164^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6728a8e2e180b96ac7940dd4d766c52f8e177717;p=linux-2.6

[TG3]: Fix bug in 40-bit DMA workaround code

Need to check the TG3_FLAG_40BIT_DMA_BUG flag in the workaround code
path instead of device flags.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index c41dbb0e8f..0fafc52646 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -3600,7 +3600,7 @@ static inline int tg3_40bit_overflow_test(struct tg3 *tp, dma_addr_t mapping,
 					  int len)
 {
 #if defined(CONFIG_HIGHMEM) && (BITS_PER_LONG == 64)
-	if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS)
+	if (tp->tg3_flags & TG3_FLAG_40BIT_DMA_BUG)
 		return (((u64) mapping + len) > DMA_40BIT_MASK);
 	return 0;
 #else