projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fd80324
1cf9e8a
)
Merge branch 'upstream-fixes'
author
Jeff Garzik
<jgarzik@pobox.com>
Tue, 13 Dec 2005 05:07:46 +0000
(
00:07
-0500)
committer
Jeff Garzik
<jgarzik@pobox.com>
Tue, 13 Dec 2005 05:07:46 +0000
(
00:07
-0500)
1
2
drivers/net/sk98lin/skge.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/sk98lin/skge.c
index
e3bdb58
,
ae73439
..
e5591d3
---
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