diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
| commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
| tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed /drivers/net/sk98lin/skge.c | |
| parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
| parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) | |
| download | kernel_goldelico_gta04-041387d98460b3947587929ef3a4773b8c48538f.zip kernel_goldelico_gta04-041387d98460b3947587929ef3a4773b8c48538f.tar.gz kernel_goldelico_gta04-041387d98460b3947587929ef3a4773b8c48538f.tar.bz2 | |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
Diffstat (limited to 'drivers/net/sk98lin/skge.c')
| -rw-r--r-- | drivers/net/sk98lin/skge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index 00c5d7f..ae73439 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c @@ -818,7 +818,7 @@ uintptr_t VNextDescr; /* the virtual bus address of the next descriptor */ /* set the pointers right */ pDescr->VNextRxd = VNextDescr & 0xffffffffULL; pDescr->pNextRxd = pNextDescr; - pDescr->TcpSumStarts = 0; + if (!IsTx) pDescr->TcpSumStarts = ETH_HLEN << 16 | ETH_HLEN; /* advance one step */ pPrevDescr = pDescr; @@ -2169,7 +2169,7 @@ rx_start: } /* frame > SK_COPY_TRESHOLD */ #ifdef USE_SK_RX_CHECKSUM - pMsg->csum = pRxd->TcpSums; + pMsg->csum = pRxd->TcpSums & 0xffff; pMsg->ip_summed = CHECKSUM_HW; #else pMsg->ip_summed = CHECKSUM_NONE; |