From: Nithin Sujir Date: Fri, 20 Dec 2013 01:44:11 +0000 (-0800) Subject: tg3: Expand 4g_overflow_test workaround to skb fragments of any size. X-Git-Tag: firefly_0821_release~3679^2~3204 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a3c448cd6dc05bbd213026fd8ac4a9cfaa83513f;p=firefly-linux-kernel-4.4.55.git tg3: Expand 4g_overflow_test workaround to skb fragments of any size. commit 375679104ab3ccfd18dcbd7ba503734fb9a2c63a upstream. The current driver assumes that an skb fragment can only be upto jumbo size. Presumably this was a fast-path optimization. This assumption is no longer true as fragments can be upto 32k. v2: Remove unnecessary parantheses per Eric Dumazet. Signed-off-by: Nithin Nayak Sujir Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index b51560d56590..36a0b438e65e 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7482,7 +7482,7 @@ static inline int tg3_4g_overflow_test(dma_addr_t mapping, int len) { u32 base = (u32) mapping & 0xffffffff; - return (base > 0xffffdcc0) && (base + len + 8 < base); + return base + len + 8 < base; } /* Test for TSO DMA buffers that cross into regions which are within MSS bytes