[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>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 61b3754f50ff..ddd0bdb498f4 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -1470,9 +1470,9 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 }
 
                 if (!(adapter->flags & UDP_CSUM_CAPABLE) &&
-                    skb->ip_summed == CHECKSUM_HW &&
+                    skb->ip_summed == CHECKSUM_PARTIAL &&
                     skb->nh.iph->protocol == IPPROTO_UDP)
-                        if (unlikely(skb_checksum_help(skb, 0))) {
+                        if (unlikely(skb_checksum_help(skb))) {
                                 dev_kfree_skb_any(skb);
                                 return NETDEV_TX_OK;
                         }
@@ -1495,11 +1495,11 @@ int t1_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 cpl = (struct cpl_tx_pkt *)__skb_push(skb, sizeof(*cpl));
                 cpl->opcode = CPL_TX_PKT;
                 cpl->ip_csum_dis = 1;    /* SW calculates IP csum */
-                cpl->l4_csum_dis = skb->ip_summed == CHECKSUM_HW ? 0 : 1;
+                cpl->l4_csum_dis = skb->ip_summed == CHECKSUM_PARTIAL ? 0 : 1;
                 /* the length field isn't used so don't bother setting it */
 
-                st->tx_cso += (skb->ip_summed == CHECKSUM_HW);
-                sge->stats.tx_do_cksum += (skb->ip_summed == CHECKSUM_HW);
+                st->tx_cso += (skb->ip_summed == CHECKSUM_PARTIAL);
+                sge->stats.tx_do_cksum += (skb->ip_summed == CHECKSUM_PARTIAL);
                 sge->stats.tx_reg_pkts++;
         }
         cpl->iff = dev->if_port;