From patchwork Thu Aug 6 14:41:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atsushi Nemoto X-Patchwork-Id: 30855 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 2D19FB6F34 for ; Fri, 7 Aug 2009 01:31:32 +1000 (EST) Received: by ozlabs.org (Postfix) id 21FCFDDD0C; Fri, 7 Aug 2009 01:31:32 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 9CF2FDDD0B for ; Fri, 7 Aug 2009 01:31:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756012AbZHFPbZ (ORCPT ); Thu, 6 Aug 2009 11:31:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753826AbZHFPbV (ORCPT ); Thu, 6 Aug 2009 11:31:21 -0400 Received: from mba.ocn.ne.jp ([122.28.14.163]:56600 "EHLO smtp.mba.ocn.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753662AbZHFPbT (ORCPT ); Thu, 6 Aug 2009 11:31:19 -0400 Received: from localhost.localdomain (p7206-ipad211funabasi.chiba.ocn.ne.jp [58.91.163.206]) by smtp.mba.ocn.ne.jp (Postfix) with ESMTP id 5CB7865FA; Thu, 6 Aug 2009 23:46:53 +0900 (JST) From: Atsushi Nemoto To: netdev@vger.kernel.org Cc: David Miller , Ralf Roesch Subject: [PATCH 1/5] tc35815: Disable StripCRC Date: Thu, 6 Aug 2009 23:41:45 +0900 Message-Id: <1249569709-21403-1-git-send-email-anemo@mba.ocn.ne.jp> X-Mailer: git-send-email 1.5.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It seems Rx_StripCRC cause trouble on recovering from the BLEx (Buffer List Exhaust) or FDAEx (Free Descriptor Area Exhaust) condition. Do not use it. Also bump version number up. Reported-by: Ralf Roesch Signed-off-by: Atsushi Nemoto --- drivers/net/tc35815.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index d737f6b..c903a68 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c @@ -23,9 +23,9 @@ */ #ifdef TC35815_NAPI -#define DRV_VERSION "1.37-NAPI" +#define DRV_VERSION "1.38-NAPI" #else -#define DRV_VERSION "1.37" +#define DRV_VERSION "1.38" #endif static const char *version = "tc35815.c:v" DRV_VERSION "\n"; #define MODNAME "tc35815" @@ -341,8 +341,9 @@ struct BDesc { Tx_EnExColl | Tx_EnLCarr | Tx_EnExDefer | Tx_EnUnder | \ Tx_En) /* maybe 0x7b01 */ #endif +/* Do not use Rx_StripCRC -- it causes trouble on BLEx/FDAEx condition */ #define RX_CTL_CMD (Rx_EnGood | Rx_EnRxPar | Rx_EnLongErr | Rx_EnOver \ - | Rx_EnCRCErr | Rx_EnAlign | Rx_StripCRC | Rx_RxEn) /* maybe 0x6f11 */ + | Rx_EnCRCErr | Rx_EnAlign | Rx_RxEn) /* maybe 0x6f01 */ #define INT_EN_CMD (Int_NRAbtEn | \ Int_DmParErrEn | Int_DParDEn | Int_DParErrEn | \ Int_SSysErrEn | Int_RMasAbtEn | Int_RTargAbtEn | \