From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 13 Dec 2005 05:07:46 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~19
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=783e3385a134305d49d7b431df6e591265e7ec14;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes'
---

783e3385a134305d49d7b431df6e591265e7ec14
diff --cc drivers/net/sk98lin/skge.c
index e3bdb583600,ae734393475..e5591d33dd2
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@@ -2163,11 -2168,14 +2163,13 @@@ rx_start
  			skb_put(pMsg, FrameLength);
  		} /* frame > SK_COPY_TRESHOLD */
  
- 		if (pRxPort->RxCsum) {
- 			pMsg->csum = pRxd->TcpSums;
- 			pMsg->ip_summed = CHECKSUM_HW;
- 		}
+ #ifdef USE_SK_RX_CHECKSUM
+ 		pMsg->csum = pRxd->TcpSums & 0xffff;
+ 		pMsg->ip_summed = CHECKSUM_HW;
+ #else
+ 		pMsg->ip_summed = CHECKSUM_NONE;
+ #endif
  
 -
  		SK_DBG_MSG(NULL, SK_DBGMOD_DRV,	1,("V"));
  		ForRlmt = SK_RLMT_RX_PROTOCOL;
  #if 0