aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorNithin Sujir <nsujir@broadcom.com>2013-12-19 17:44:11 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-09 12:24:22 -0800
commita3c448cd6dc05bbd213026fd8ac4a9cfaa83513f (patch)
treea6905ff0194050c9af6be1cefe5c140261238f57 /drivers/net
parent88285f766c96205ccf30afd3d0621401701ff26c (diff)
downloadlinaro-lsk-a3c448cd6dc05bbd213026fd8ac4a9cfaa83513f.tar.gz
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 <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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index b51560d5659..36a0b438e65 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