From 36301c7b601f6da285f2edaae560f9bb5a4fba64 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Thu, 6 Aug 2009 04:41:45 +0000 Subject: [PATCH] --- yaml --- r: 159433 b: refs/heads/master c: 297713decac17527d3583fcd4d18564568cac759 h: refs/heads/master i: 159431: 5dc8baa09b91750f1d0cd6b83a1d2657cae5ab2f v: v3 --- [refs] | 2 +- trunk/drivers/net/tc35815.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2f075d57803a..8f22342f8338 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfe34ebbaa125f00da309f59cc9d30febe1e3115 +refs/heads/master: 297713decac17527d3583fcd4d18564568cac759 diff --git a/trunk/drivers/net/tc35815.c b/trunk/drivers/net/tc35815.c index 1ce2da172ca9..a7581632f811 100644 --- a/trunk/drivers/net/tc35815.c +++ b/trunk/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 | \