tg3: Expand 4g_overflow_test workaround to skb fragments of any size.

Nithin Sujir · gregkh · commit 43ed0aca17f8 · 2014-01-09T12:25:11.000-08:00
commit 3756791 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 <nsujir@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
@@ -7608,7 +7608,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

Original file line number	Diff line number	Diff line change
`@@ -7608,7 +7608,7 @@ static inline int tg3_4g_overflow_test(dma_addr_t mapping, int len)`
`7608`	`7608`	`{`
`7609`	`7609`	`u32 base = (u32) mapping & 0xffffffff;`
`7610`	`7610`
`7611`		`- return (base > 0xffffdcc0) && (base + len + 8 < base);`
	`7611`	`+ return base + len + 8 < base;`
`7612`	`7612`	`}`
`7613`	`7613`
`7614`	`7614`	`/* Test for TSO DMA buffers that cross into regions which are within MSS bytes`