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

2 files changed, 8 insertions, 8 deletions

diff --git a/net/ipv4/ipvs/ip_vs_proto_tcp.c b/net/ipv4/ipvs/ip_vs_proto_tcp.c
index bc28b1160a3a..820e8318d10d 100644
--- a/net/ipv4/ipvs/ip_vs_proto_tcp.c
+++ b/net/ipv4/ipvs/ip_vs_proto_tcp.c
@@ -151,7 +151,7 @@ tcp_snat_handler(struct sk_buff **pskb,
                 /* Only port and addr are changed, do fast csum update */
                 tcp_fast_csum_update(tcph, cp->daddr, cp->vaddr,
                                      cp->dport, cp->vport);
-                if ((*pskb)->ip_summed == CHECKSUM_HW)
+                if ((*pskb)->ip_summed == CHECKSUM_COMPLETE)
                         (*pskb)->ip_summed = CHECKSUM_NONE;
         } else {
                 /* full checksum calculation */
@@ -204,7 +204,7 @@ tcp_dnat_handler(struct sk_buff **pskb,
                 /* Only port and addr are changed, do fast csum update */
                 tcp_fast_csum_update(tcph, cp->vaddr, cp->daddr,
                                      cp->vport, cp->dport);
-                if ((*pskb)->ip_summed == CHECKSUM_HW)
+                if ((*pskb)->ip_summed == CHECKSUM_COMPLETE)
                         (*pskb)->ip_summed = CHECKSUM_NONE;
         } else {
                 /* full checksum calculation */
@@ -229,7 +229,7 @@ tcp_csum_check(struct sk_buff *skb, struct ip_vs_protocol *pp)
         switch (skb->ip_summed) {
         case CHECKSUM_NONE:
                 skb->csum = skb_checksum(skb, tcphoff, skb->len - tcphoff, 0);
-        case CHECKSUM_HW:
+        case CHECKSUM_COMPLETE:
                 if (csum_tcpudp_magic(skb->nh.iph->saddr, skb->nh.iph->daddr,
                                       skb->len - tcphoff,
                                       skb->nh.iph->protocol, skb->csum)) {
@@ -239,7 +239,7 @@ tcp_csum_check(struct sk_buff *skb, struct ip_vs_protocol *pp)
                 }
                 break;
         default:
-                /* CHECKSUM_UNNECESSARY */
+                /* No need to checksum. */
                 break;
         }
 
diff --git a/net/ipv4/ipvs/ip_vs_proto_udp.c b/net/ipv4/ipvs/ip_vs_proto_udp.c
index 89d9175d8f28..90c8166c0ec1 100644
--- a/net/ipv4/ipvs/ip_vs_proto_udp.c
+++ b/net/ipv4/ipvs/ip_vs_proto_udp.c
@@ -161,7 +161,7 @@ udp_snat_handler(struct sk_buff **pskb,
                 /* Only port and addr are changed, do fast csum update */
                 udp_fast_csum_update(udph, cp->daddr, cp->vaddr,
                                      cp->dport, cp->vport);
-                if ((*pskb)->ip_summed == CHECKSUM_HW)
+                if ((*pskb)->ip_summed == CHECKSUM_COMPLETE)
                         (*pskb)->ip_summed = CHECKSUM_NONE;
         } else {
                 /* full checksum calculation */
@@ -216,7 +216,7 @@ udp_dnat_handler(struct sk_buff **pskb,
                 /* Only port and addr are changed, do fast csum update */
                 udp_fast_csum_update(udph, cp->vaddr, cp->daddr,
                                      cp->vport, cp->dport);
-                if ((*pskb)->ip_summed == CHECKSUM_HW)
+                if ((*pskb)->ip_summed == CHECKSUM_COMPLETE)
                         (*pskb)->ip_summed = CHECKSUM_NONE;
         } else {
                 /* full checksum calculation */
@@ -250,7 +250,7 @@ udp_csum_check(struct sk_buff *skb, struct ip_vs_protocol *pp)
                 case CHECKSUM_NONE:
                         skb->csum = skb_checksum(skb, udphoff,
                                                  skb->len - udphoff, 0);
-                case CHECKSUM_HW:
+                case CHECKSUM_COMPLETE:
                         if (csum_tcpudp_magic(skb->nh.iph->saddr,
                                               skb->nh.iph->daddr,
                                               skb->len - udphoff,
@@ -262,7 +262,7 @@ udp_csum_check(struct sk_buff *skb, struct ip_vs_protocol *pp)
                         }
                         break;
                 default:
-                        /* CHECKSUM_UNNECESSARY */
+                        /* No need to checksum. */
                         break;
                 }
         }