diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2009-08-06 00:41:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-06 16:14:20 -0400 |
commit | 297713decac17527d3583fcd4d18564568cac759 (patch) | |
tree | a952f5c95f4030cf12b2e0e71e77013c3b32302e /drivers/net/tc35815.c | |
parent | bfe34ebbaa125f00da309f59cc9d30febe1e3115 (diff) |
tc35815: Disable StripCRC
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 <ralf.roesch@rw-gmbh.de>
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tc35815.c')
-rw-r--r-- | 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 1ce2da172ca9..a7581632f811 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
@@ -23,9 +23,9 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #ifdef TC35815_NAPI | 25 | #ifdef TC35815_NAPI |
26 | #define DRV_VERSION "1.37-NAPI" | 26 | #define DRV_VERSION "1.38-NAPI" |
27 | #else | 27 | #else |
28 | #define DRV_VERSION "1.37" | 28 | #define DRV_VERSION "1.38" |
29 | #endif | 29 | #endif |
30 | static const char *version = "tc35815.c:v" DRV_VERSION "\n"; | 30 | static const char *version = "tc35815.c:v" DRV_VERSION "\n"; |
31 | #define MODNAME "tc35815" | 31 | #define MODNAME "tc35815" |
@@ -341,8 +341,9 @@ struct BDesc { | |||
341 | Tx_EnExColl | Tx_EnLCarr | Tx_EnExDefer | Tx_EnUnder | \ | 341 | Tx_EnExColl | Tx_EnLCarr | Tx_EnExDefer | Tx_EnUnder | \ |
342 | Tx_En) /* maybe 0x7b01 */ | 342 | Tx_En) /* maybe 0x7b01 */ |
343 | #endif | 343 | #endif |
344 | /* Do not use Rx_StripCRC -- it causes trouble on BLEx/FDAEx condition */ | ||
344 | #define RX_CTL_CMD (Rx_EnGood | Rx_EnRxPar | Rx_EnLongErr | Rx_EnOver \ | 345 | #define RX_CTL_CMD (Rx_EnGood | Rx_EnRxPar | Rx_EnLongErr | Rx_EnOver \ |
345 | | Rx_EnCRCErr | Rx_EnAlign | Rx_StripCRC | Rx_RxEn) /* maybe 0x6f11 */ | 346 | | Rx_EnCRCErr | Rx_EnAlign | Rx_RxEn) /* maybe 0x6f01 */ |
346 | #define INT_EN_CMD (Int_NRAbtEn | \ | 347 | #define INT_EN_CMD (Int_NRAbtEn | \ |
347 | Int_DmParErrEn | Int_DParDEn | Int_DParErrEn | \ | 348 | Int_DmParErrEn | Int_DParDEn | Int_DParErrEn | \ |
348 | Int_SSysErrEn | Int_RMasAbtEn | Int_RTargAbtEn | \ | 349 | Int_SSysErrEn | Int_RMasAbtEn | Int_RTargAbtEn | \ |