Merge branch 'upstream-fixes'

diff --cc drivers/net/sk98lin/skge.c
index e3bdb58360011f853a10f3747de2ce89a7eca14e,ae734393475876a6c0bd9ce521fb714967c15f21..e5591d33dd284fab3a9fa4b6f870cec85753eb96
--- 1/drivers/net/sk98lin/skge.c
--- 2/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