diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 19:41:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-12 19:41:37 -0500 |
| commit | 238523e1a15874b88955ff9c8f63e35597ae2857 (patch) | |
| tree | 3a794b119a40a7dd5bd73b513297c4580a090303 /drivers/net/sk98lin/skge.c | |
| parent | 1ff8038988adecfde71d82c0597727fc239d4e8c (diff) | |
| parent | 016cc85072944bfa03c5e4b587ae89588ce2e5df (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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 00c5d7f04c68..ae7343934758 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 */ | |||
| 818 | /* set the pointers right */ | 818 | /* set the pointers right */ |
| 819 | pDescr->VNextRxd = VNextDescr & 0xffffffffULL; | 819 | pDescr->VNextRxd = VNextDescr & 0xffffffffULL; |
| 820 | pDescr->pNextRxd = pNextDescr; | 820 | pDescr->pNextRxd = pNextDescr; |
| 821 | pDescr->TcpSumStarts = 0; | 821 | if (!IsTx) pDescr->TcpSumStarts = ETH_HLEN << 16 | ETH_HLEN; |
| 822 | 822 | ||
| 823 | /* advance one step */ | 823 | /* advance one step */ |
| 824 | pPrevDescr = pDescr; | 824 | pPrevDescr = pDescr; |
| @@ -2169,7 +2169,7 @@ rx_start: | |||
| 2169 | } /* frame > SK_COPY_TRESHOLD */ | 2169 | } /* frame > SK_COPY_TRESHOLD */ |
| 2170 | 2170 | ||
| 2171 | #ifdef USE_SK_RX_CHECKSUM | 2171 | #ifdef USE_SK_RX_CHECKSUM |
| 2172 | pMsg->csum = pRxd->TcpSums; | 2172 | pMsg->csum = pRxd->TcpSums & 0xffff; |
| 2173 | pMsg->ip_summed = CHECKSUM_HW; | 2173 | pMsg->ip_summed = CHECKSUM_HW; |
| 2174 | #else | 2174 | #else |
| 2175 | pMsg->ip_summed = CHECKSUM_NONE; | 2175 | pMsg->ip_summed = CHECKSUM_NONE; |