From patchwork Fri Dec 20 00:24:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Sujir X-Patchwork-Id: 303777 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 193EE2C00A8 for ; Fri, 20 Dec 2013 11:24:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756722Ab3LTAYT (ORCPT ); Thu, 19 Dec 2013 19:24:19 -0500 Received: from mail-gw1-out.broadcom.com ([216.31.210.62]:14620 "EHLO mail-gw1-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756461Ab3LTAYS (ORCPT ); Thu, 19 Dec 2013 19:24:18 -0500 X-IronPort-AV: E=Sophos;i="4.95,516,1384329600"; d="scan'208";a="4216708" Received: from irvexchcas08.broadcom.com (HELO IRVEXCHCAS08.corp.ad.broadcom.com) ([10.9.208.57]) by mail-gw1-out.broadcom.com with ESMTP; 19 Dec 2013 16:30:13 -0800 Received: from IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Thu, 19 Dec 2013 16:24:17 -0800 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP1.corp.ad.broadcom.com (10.9.207.51) with Microsoft SMTP Server id 14.1.438.0; Thu, 19 Dec 2013 16:24:17 -0800 Received: from dl1.broadcom.com (dhcp-10-13-115-146.broadcom.com [10.13.115.146]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 5D54F246A3; Thu, 19 Dec 2013 16:24:17 -0800 (PST) From: Nithin Nayak Sujir To: CC: , Nithin Nayak Sujir , , Michael Chan Subject: [PATCH net] tg3: Expand 4g_overflow_test workaround to skb fragments of any size. Date: Thu, 19 Dec 2013 16:24:12 -0800 Message-ID: <1387499052-7838-1-git-send-email-nsujir@broadcom.com> X-Mailer: git-send-email 1.8.1.4 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Cc: stable@vger.kernel.org Signed-off-by: Nithin Nayak Sujir Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/tg3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index f3dd93b..8ab21d7 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7622,7 +7622,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