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

29 files changed, 58 insertions, 57 deletions

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 80e8ca013e44..29dede2eaa85 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -2077,7 +2077,7 @@ boomerang_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         vp->tx_ring[entry].next = 0;
 #if DO_ZEROCOPY
-        if (skb->ip_summed != CHECKSUM_HW)
+        if (skb->ip_summed != CHECKSUM_PARTIAL)
                         vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded);
         else
                         vp->tx_ring[entry].status = cpu_to_le32(skb->len | TxIntrUploaded | AddTCPChksum | AddUDPChksum);
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 1428bb7715af..a48b211c489d 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -813,7 +813,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
 
                 if (mss)
                         flags |= LargeSend | ((mss & MSSMask) << MSSShift);
-                else if (skb->ip_summed == CHECKSUM_HW) {
+                else if (skb->ip_summed == CHECKSUM_PARTIAL) {
                         const struct iphdr *ip = skb->nh.iph;
                         if (ip->protocol == IPPROTO_TCP)
                                 flags |= IPCS | TCPCS;
@@ -867,7 +867,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
                         if (mss)
                                 ctrl |= LargeSend |
                                         ((mss & MSSMask) << MSSShift);
-                        else if (skb->ip_summed == CHECKSUM_HW) {
+                        else if (skb->ip_summed == CHECKSUM_PARTIAL) {
                                 if (ip->protocol == IPPROTO_TCP)
                                         ctrl |= IPCS | TCPCS;
                                 else if (ip->protocol == IPPROTO_UDP)
@@ -898,7 +898,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
                 txd->addr = cpu_to_le64(first_mapping);
                 wmb();
 
-                if (skb->ip_summed == CHECKSUM_HW) {
+                if (skb->ip_summed == CHECKSUM_PARTIAL) {
                         if (ip->protocol == IPPROTO_TCP)
                                 txd->opts1 = cpu_to_le32(first_eor | first_len |
                                                          FirstFrag | DescOwn |
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 1c01e9b3d07c..826548644d7b 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -2040,7 +2040,7 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
                  */
                 if (bd_flags & BD_FLG_TCP_UDP_SUM) {
                         skb->csum = htons(csum);
-                        skb->ip_summed = CHECKSUM_HW;
+                        skb->ip_summed = CHECKSUM_COMPLETE;
                 } else {
                         skb->ip_summed = CHECKSUM_NONE;
                 }
@@ -2511,7 +2511,7 @@ restart:
 
                 mapping = ace_map_tx_skb(ap, skb, skb, idx);
                 flagsize = (skb->len << 16) | (BD_FLG_END);
-                if (skb->ip_summed == CHECKSUM_HW)
+                if (skb->ip_summed == CHECKSUM_PARTIAL)
                         flagsize |= BD_FLG_TCP_UDP_SUM;
 #if ACENIC_DO_VLAN
                 if (vlan_tx_tag_present(skb)) {
@@ -2534,7 +2534,7 @@ restart:
 
                 mapping = ace_map_tx_skb(ap, skb, NULL, idx);
                 flagsize = (skb_headlen(skb) << 16);
-                if (skb->ip_summed == CHECKSUM_HW)
+                if (skb->ip_summed == CHECKSUM_PARTIAL)
                         flagsize |= BD_FLG_TCP_UDP_SUM;
 #if ACENIC_DO_VLAN
                 if (vlan_tx_tag_present(skb)) {
@@ -2560,7 +2560,7 @@ restart:
                                                PCI_DMA_TODEVICE);
 
                         flagsize = (frag->size << 16);
-                        if (skb->ip_summed == CHECKSUM_HW)
+                        if (skb->ip_summed == CHECKSUM_PARTIAL)
                                 flagsize |= BD_FLG_TCP_UDP_SUM;
                         idx = (idx + 1) % ACE_TX_RING_ENTRIES(ap);
 
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 652eb05a6c2d..7857b4630124 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -4423,7 +4423,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev)
         ring_prod = TX_RING_IDX(prod);
 
         vlan_tag_flags = 0;
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 vlan_tag_flags |= TX_BD_FLAGS_TCP_UDP_CKSUM;
         }
 
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index a31544ccb3c4..558fdb8ad2dc 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -2167,7 +2167,7 @@ end_copy_pkt:
                         cas_page_unmap(addr);
         }
         skb->csum = ntohs(i ^ 0xffff);
-        skb->ip_summed = CHECKSUM_HW;
+        skb->ip_summed = CHECKSUM_COMPLETE;
         skb->protocol = eth_type_trans(skb, cp->dev);
         return len;
 }
@@ -2821,7 +2821,7 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring,
         }
 
         ctrl = 0;
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 u64 csum_start_off, csum_stuff_off;
 
                 csum_start_off = (u64) (skb->h.raw - skb->data);
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;
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index 402961e68c89..b74e67654764 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -611,7 +611,7 @@ start_xmit (struct sk_buff *skb, struct net_device *dev)
         txdesc = &np->tx_ring[entry];
 
 #if 0
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 txdesc->status |=
                     cpu_to_le64 (TCPChecksumEnable | UDPChecksumEnable |
                                  IPChecksumEnable);
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 98ef9f85482f..2ab9f96f5dab 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2600,7 +2600,7 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
         unsigned int i;
         uint8_t css;
 
-        if (likely(skb->ip_summed == CHECKSUM_HW)) {
+        if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 css = skb->h.raw - skb->data;
 
                 i = tx_ring->next_to_use;
@@ -2927,11 +2927,11 @@ e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         }
 
         /* reserve a descriptor for the offload context */
-        if ((mss) || (skb->ip_summed == CHECKSUM_HW))
+        if ((mss) || (skb->ip_summed == CHECKSUM_PARTIAL))
                 count++;
         count++;
 #else
-        if (skb->ip_summed == CHECKSUM_HW)
+        if (skb->ip_summed == CHECKSUM_PARTIAL)
                 count++;
 #endif
 
@@ -3608,7 +3608,7 @@ e1000_rx_checksum(struct e1000_adapter *adapter,
                  */
                 csum = ntohl(csum ^ 0xFFFF);
                 skb->csum = csum;
-                skb->ip_summed = CHECKSUM_HW;
+                skb->ip_summed = CHECKSUM_COMPLETE;
         }
         adapter->hw_csum_good++;
 }
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 11b8f1b43dd5..32cacf115f75 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -1503,7 +1503,8 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 tx_flags_extra = NV_TX2_TSO | (skb_shinfo(skb)->gso_size << NV_TX2_TSO_SHIFT);
         else
 #endif
-        tx_flags_extra = (skb->ip_summed == CHECKSUM_HW ? (NV_TX2_CHECKSUM_L3|NV_TX2_CHECKSUM_L4) : 0);
+        tx_flags_extra = skb->ip_summed == CHECKSUM_PARTIAL ?
+                         NV_TX2_CHECKSUM_L3 | NV_TX2_CHECKSUM_L4 : 0;
 
         /* vlan tag */
         if (np->vlangrp && vlan_tx_tag_present(skb)) {
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index ebbbd6ca6204..ba960913c034 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -947,7 +947,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         /* Set up checksumming */
         if (likely((dev->features & NETIF_F_IP_CSUM)
-                        && (CHECKSUM_HW == skb->ip_summed))) {
+                        && (CHECKSUM_PARTIAL == skb->ip_summed))) {
                 fcb = gfar_add_fcb(skb, txbdp);
                 status |= TXBD_TOE;
                 gfar_tx_checksum(skb, fcb);
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 409c6aab0411..763373ae9666 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -1648,7 +1648,7 @@ static int hamachi_rx(struct net_device *dev)
                                                 * could do the pseudo myself and return
                                                 * CHECKSUM_UNNECESSARY
                                                 */
-                                                skb->ip_summed = CHECKSUM_HW;
+                                                skb->ip_summed = CHECKSUM_COMPLETE;
                                         }
                                 }       
                         }
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 82468e2dc799..57e214d85e9a 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -1036,7 +1036,7 @@ static inline u16 emac_tx_csum(struct ocp_enet_private *dev,
                                struct sk_buff *skb)
 {
 #if defined(CONFIG_IBM_EMAC_TAH)
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 ++dev->stats.tx_packets_csum;
                 return EMAC_TX_CTRL_TAH_CSUM;
         }
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 68d8af7df08e..65f897ddb920 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1387,7 +1387,7 @@ static int ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)
          * MAC header which should not be summed and the TCP/UDP pseudo headers
          * manually.
          */
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 int proto = ntohs(skb->nh.iph->protocol);
                 unsigned int csoff;
                 struct iphdr *ih = skb->nh.iph;
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 7bbd447289b5..9405b44f3214 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1232,7 +1232,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
         unsigned int i;
         uint8_t css, cso;
 
-        if(likely(skb->ip_summed == CHECKSUM_HW)) {
+        if(likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 css = skb->h.raw - skb->data;
                 cso = (skb->h.raw + skb->csum) - skb->data;
 
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index eeab1df5bef3..38df58fdb358 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -1147,7 +1147,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
         desc->byte_cnt = length;
         desc->buf_ptr = dma_map_single(NULL, skb->data, length, DMA_TO_DEVICE);
 
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 BUG_ON(skb->protocol != ETH_P_IP);
 
                 cmd_sts |= ETH_GEN_TCP_UDP_CHECKSUM |
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 9bdd43ab3573..9f16681d0e7e 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -930,7 +930,7 @@ static inline void myri10ge_vlan_ip_csum(struct sk_buff *skb, u16 hw_csum)
             (vh->h_vlan_encapsulated_proto == htons(ETH_P_IP) ||
              vh->h_vlan_encapsulated_proto == htons(ETH_P_IPV6))) {
                 skb->csum = hw_csum;
-                skb->ip_summed = CHECKSUM_HW;
+                skb->ip_summed = CHECKSUM_COMPLETE;
         }
 }
 
@@ -973,7 +973,7 @@ myri10ge_rx_done(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
                 if ((skb->protocol == ntohs(ETH_P_IP)) ||
                     (skb->protocol == ntohs(ETH_P_IPV6))) {
                         skb->csum = ntohs((u16) csum);
-                        skb->ip_summed = CHECKSUM_HW;
+                        skb->ip_summed = CHECKSUM_COMPLETE;
                 } else
                         myri10ge_vlan_ip_csum(skb, ntohs((u16) csum));
         }
@@ -1897,13 +1897,13 @@ again:
         pseudo_hdr_offset = 0;
         odd_flag = 0;
         flags = (MXGEFW_FLAGS_NO_TSO | MXGEFW_FLAGS_FIRST);
-        if (likely(skb->ip_summed == CHECKSUM_HW)) {
+        if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 cksum_offset = (skb->h.raw - skb->data);
                 pseudo_hdr_offset = (skb->h.raw + skb->csum) - skb->data;
                 /* If the headers are excessively large, then we must
                  * fall back to a software checksum */
                 if (unlikely(cksum_offset > 255 || pseudo_hdr_offset > 127)) {
-                        if (skb_checksum_help(skb, 0))
+                        if (skb_checksum_help(skb))
                                 goto drop;
                         cksum_offset = 0;
                         pseudo_hdr_offset = 0;
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index 0e76859c90a2..5143f5dbb2e5 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1153,7 +1153,7 @@ again:
         if (!nr_frags)
                 frag = NULL;
         extsts = 0;
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 extsts |= EXTSTS_IPPKT;
                 if (IPPROTO_TCP == skb->nh.iph->protocol)
                         extsts |= EXTSTS_TCPPKT;
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 4c2f575faad7..d9b960aa9b0d 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2169,7 +2169,7 @@ static inline u32 rtl8169_tso_csum(struct sk_buff *skb, struct net_device *dev)
                 if (mss)
                         return LargeSend | ((mss & MSSMask) << MSSShift);
         }
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 const struct iphdr *ip = skb->nh.iph;
 
                 if (ip->protocol == IPPROTO_TCP)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index e72e0e099060..5b3713f622d7 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3893,7 +3893,7 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                 txdp->Control_1 |= TXD_TCP_LSO_MSS(s2io_tcp_mss(skb));
         }
 #endif
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 txdp->Control_2 |=
                     (TXD_TX_CKO_IPV4_EN | TXD_TX_CKO_TCP_EN |
                      TXD_TX_CKO_UDP_EN);
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index ee62845d3ac9..eb3b35180c2f 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -1559,7 +1559,7 @@ struct sk_buff	*pMessage)	/* pointer to send-message              */
         pTxd->VDataHigh = (SK_U32) (PhysAddr >> 32);
         pTxd->pMBuf     = pMessage;
 
-        if (pMessage->ip_summed == CHECKSUM_HW) {
+        if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
                 u16 hdrlen = pMessage->h.raw - pMessage->data;
                 u16 offset = hdrlen + pMessage->csum;
 
@@ -1678,7 +1678,7 @@ struct sk_buff	*pMessage)	/* pointer to send-message              */
         /* 
         ** Does the HW need to evaluate checksum for TCP or UDP packets? 
         */
-        if (pMessage->ip_summed == CHECKSUM_HW) {
+        if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
                 u16 hdrlen = pMessage->h.raw - pMessage->data;
                 u16 offset = hdrlen + pMessage->csum;
 
@@ -2158,7 +2158,7 @@ rx_start:
 
 #ifdef USE_SK_RX_CHECKSUM
                 pMsg->csum = pRxd->TcpSums & 0xffff;
-                pMsg->ip_summed = CHECKSUM_HW;
+                pMsg->ip_summed = CHECKSUM_COMPLETE;
 #else
                 pMsg->ip_summed = CHECKSUM_NONE;
 #endif
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index ad878dfddef4..b3d6fa3d6df4 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2338,7 +2338,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
         td->dma_lo = map;
         td->dma_hi = map >> 32;
 
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 int offset = skb->h.raw - skb->data;
 
                 /* This seems backwards, but it is what the sk98lin
@@ -2642,7 +2642,7 @@ static inline struct sk_buff *skge_rx_get(struct skge_port *skge,
         skb->dev = skge->netdev;
         if (skge->rx_csum) {
                 skb->csum = csum;
-                skb->ip_summed = CHECKSUM_HW;
+                skb->ip_summed = CHECKSUM_COMPLETE;
         }
 
         skb->protocol = eth_type_trans(skb, skge->netdev);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 933e87f1cc68..8e92566b587e 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1163,7 +1163,7 @@ static unsigned tx_le_req(const struct sk_buff *skb)
         if (skb_is_gso(skb))
                 ++count;
 
-        if (skb->ip_summed == CHECKSUM_HW)
+        if (skb->ip_summed == CHECKSUM_PARTIAL)
                 ++count;
 
         return count;
@@ -1272,7 +1272,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 #endif
 
         /* Handle TCP checksum offload */
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 u16 hdr = skb->h.raw - skb->data;
                 u16 offset = hdr + skb->csum;
 
@@ -2000,7 +2000,7 @@ static int sky2_status_intr(struct sky2_hw *hw, int to_do)
 #endif
                 case OP_RXCHKS:
                         skb = sky2->rx_ring[sky2->rx_next].skb;
-                        skb->ip_summed = CHECKSUM_HW;
+                        skb->ip_summed = CHECKSUM_COMPLETE;
                         skb->csum = le16_to_cpu(status);
                         break;
 
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index c0a62b00ffc8..2607aa51d8e0 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1230,7 +1230,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
         }
 
 #if defined(ZEROCOPY) && defined(HAS_BROKEN_FIRMWARE)
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 if (skb_padto(skb, (skb->len + PADDING_MASK) & ~PADDING_MASK))
                         return NETDEV_TX_OK;
         }
@@ -1252,7 +1252,7 @@ static int start_tx(struct sk_buff *skb, struct net_device *dev)
                                 status |= TxDescIntr;
                                 np->reap_tx = 0;
                         }
-                        if (skb->ip_summed == CHECKSUM_HW) {
+                        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                                 status |= TxCalTCP;
                                 np->stats.tx_compressed++;
                         }
@@ -1499,7 +1499,7 @@ static int __netdev_rx(struct net_device *dev, int *quota)
                  * Until then, the printk stays. :-) -Ion
                  */
                 else if (le16_to_cpu(desc->status2) & 0x0040) {
-                        skb->ip_summed = CHECKSUM_HW;
+                        skb->ip_summed = CHECKSUM_COMPLETE;
                         skb->csum = le16_to_cpu(desc->csum);
                         printk(KERN_DEBUG "%s: checksum_hw, status2 = %#x\n", dev->name, le16_to_cpu(desc->status2));
                 }
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index d7b1d1882cab..b388651b7836 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -855,7 +855,7 @@ static int gem_rx(struct gem *gp, int work_to_do)
                 }
 
                 skb->csum = ntohs((status & RXDCTRL_TCPCSUM) ^ 0xffff);
-                skb->ip_summed = CHECKSUM_HW;
+                skb->ip_summed = CHECKSUM_COMPLETE;
                 skb->protocol = eth_type_trans(skb, gp->dev);
 
                 netif_receive_skb(skb);
@@ -1026,7 +1026,7 @@ static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev)
         unsigned long flags;
 
         ctrl = 0;
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 u64 csum_start_off, csum_stuff_off;
 
                 csum_start_off = (u64) (skb->h.raw - skb->data);
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index c6f5bc3c042f..17981da22730 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -1207,7 +1207,7 @@ static void happy_meal_transceiver_check(struct happy_meal *hp, void __iomem *tr
  * flags, thus:
  *
  *      skb->csum = rxd->rx_flags & 0xffff;
- *      skb->ip_summed = CHECKSUM_HW;
+ *      skb->ip_summed = CHECKSUM_COMPLETE;
  *
  * before sending off the skb to the protocols, and we are good as gold.
  */
@@ -2074,7 +2074,7 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev)
 
                 /* This card is _fucking_ hot... */
                 skb->csum = ntohs(csum ^ 0xffff);
-                skb->ip_summed = CHECKSUM_HW;
+                skb->ip_summed = CHECKSUM_COMPLETE;
 
                 RXD(("len=%d csum=%4x]", len, csum));
                 skb->protocol = eth_type_trans(skb, dev);
@@ -2268,7 +2268,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
         u32 tx_flags;
 
         tx_flags = TXFLAG_OWN;
-        if (skb->ip_summed == CHECKSUM_HW) {
+        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 u32 csum_start_off, csum_stuff_off;
 
                 csum_start_off = (u32) (skb->h.raw - skb->data);
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)
                 skb->h.th->check = 0;
 
         }
-        else if (skb->ip_summed == CHECKSUM_HW)
+        else if (skb->ip_summed == CHECKSUM_PARTIAL)
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
 #else
         mss = 0;
-        if (skb->ip_summed == CHECKSUM_HW)
+        if (skb->ip_summed == CHECKSUM_PARTIAL)
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
 #endif
 #if TG3_VLAN_TAG_USED
@@ -3981,7 +3981,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
 
         entry = tp->tx_prod;
         base_flags = 0;
-        if (skb->ip_summed == CHECKSUM_HW)
+        if (skb->ip_summed == CHECKSUM_PARTIAL)
                 base_flags |= TXD_FLAG_TCPUDP_CSUM;
 #if TG3_TSO_SUPPORT != 0
         mss = 0;
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 4103c37172f9..c6e601dc6bbc 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -830,7 +830,7 @@ typhoon_start_tx(struct sk_buff *skb, struct net_device *dev)
         first_txd->addrHi = (u64)((unsigned long) skb) >> 32;
         first_txd->processFlags = 0;
 
-        if(skb->ip_summed == CHECKSUM_HW) {
+        if(skb->ip_summed == CHECKSUM_PARTIAL) {
                 /* The 3XP will figure out if this is UDP/TCP */
                 first_txd->processFlags |= TYPHOON_TX_PF_TCP_CHKSUM;
                 first_txd->processFlags |= TYPHOON_TX_PF_UDP_CHKSUM;
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index ae971080e2e4..66547159bfd9 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1230,7 +1230,7 @@ static int rhine_start_tx(struct sk_buff *skb, struct net_device *dev)
         rp->tx_skbuff[entry] = skb;
 
         if ((rp->quirks & rqRhineI) &&
-            (((unsigned long)skb->data & 3) || skb_shinfo(skb)->nr_frags != 0 || skb->ip_summed == CHECKSUM_HW)) {
+            (((unsigned long)skb->data & 3) || skb_shinfo(skb)->nr_frags != 0 || skb->ip_summed == CHECKSUM_PARTIAL)) {
                 /* Must use alignment buffer. */
                 if (skb->len > PKT_BUF_SZ) {
                         /* packet too long, drop it */
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index aa9cd92f46b2..f1e0c746a388 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -2002,7 +2002,7 @@ static int velocity_xmit(struct sk_buff *skb, struct net_device *dev)
          *      Handle hardware checksum
          */
         if ((vptr->flags & VELOCITY_FLAGS_TX_CSUM)
-                                 && (skb->ip_summed == CHECKSUM_HW)) {
+                                 && (skb->ip_summed == CHECKSUM_PARTIAL)) {
                 struct iphdr *ip = skb->nh.iph;
                 if (ip->protocol == IPPROTO_TCP)
                         td_ptr->tdesc1.TCR |= TCR0_TCPCK;