diff --git a/[refs] b/[refs] index 3ccc34db6cff..3c373875a6e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 008652b337364ee994a0cd71d88a0fe9f00fc7ca +refs/heads/master: 6728a8e2e180b96ac7940dd4d766c52f8e177717 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index c41dbb0e8f14..0fafc5264627 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/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