commit 20234989a8ae0ff418e2acdef72205fb7cb3f819
author Jeff Garzik <jgarzik@pobox.com> Mon Dec 12 15:30:15 2005 -0500
committer Jeff Garzik <jgarzik@pobox.com> Mon Dec 12 15:30:15 2005 -0500
tree 6888e6c6b8f2beef67b3f85570aebb853f8443f9
parent 92f268e034faf793f6d40de2f0fc81478a14ff39
parent 49d7bc64283970ee83d2c954d04ba00d04e5943d

Merge branch 'master'

drivers/net/sk98lin/skge.c

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 @@
 		/* 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 @@
 		} /* 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;