diff options
author | Patrick McHardy <kaber@trash.net> | 2006-08-29 19:44:56 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-22 17:53:53 -0400 |
commit | 84fa7933a33f806bbbaae6775e87459b1ec584c0 (patch) | |
tree | 5be404225d90f640997b12f631e9b496b3fd0d61 /drivers/net/tg3.c | |
parent | 8584d6df39db5601965f9bc5e3bf2fea833ad7bb (diff) |
[NET]: Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE
Replace CHECKSUM_HW by CHECKSUM_PARTIAL (for outgoing packets, whose
checksum still needs to be completed) and CHECKSUM_COMPLETE (for
incoming packets, device supplied full checksum).
Patch originally from Herbert Xu, updated by myself for 2.6.18-rc3.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index eafabb253f08..6f5d3a38c582 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -3851,11 +3851,11 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
3851 | skb->h.th->check = 0; | 3851 | skb->h.th->check = 0; |
3852 | 3852 | ||
3853 | } | 3853 | } |
3854 | else if (skb->ip_summed == CHECKSUM_HW) | 3854 | else if (skb->ip_summed == CHECKSUM_PARTIAL) |
3855 | base_flags |= TXD_FLAG_TCPUDP_CSUM; | 3855 | base_flags |= TXD_FLAG_TCPUDP_CSUM; |
3856 | #else | 3856 | #else |
3857 | mss = 0; | 3857 | mss = 0; |
3858 | if (skb->ip_summed == CHECKSUM_HW) | 3858 | if (skb->ip_summed == CHECKSUM_PARTIAL) |
3859 | base_flags |= TXD_FLAG_TCPUDP_CSUM; | 3859 | base_flags |= TXD_FLAG_TCPUDP_CSUM; |
3860 | #endif | 3860 | #endif |
3861 | #if TG3_VLAN_TAG_USED | 3861 | #if TG3_VLAN_TAG_USED |
@@ -3981,7 +3981,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev) | |||
3981 | 3981 | ||
3982 | entry = tp->tx_prod; | 3982 | entry = tp->tx_prod; |
3983 | base_flags = 0; | 3983 | base_flags = 0; |
3984 | if (skb->ip_summed == CHECKSUM_HW) | 3984 | if (skb->ip_summed == CHECKSUM_PARTIAL) |
3985 | base_flags |= TXD_FLAG_TCPUDP_CSUM; | 3985 | base_flags |= TXD_FLAG_TCPUDP_CSUM; |
3986 | #if TG3_TSO_SUPPORT != 0 | 3986 | #if TG3_TSO_SUPPORT != 0 |
3987 | mss = 0; | 3987 | mss = 0; |