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

3 files changed, 5 insertions, 7 deletions

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index af8adcba23a..308d2abd7ee 100644
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -823,8 +823,7 @@ static int tcp_error(struct sk_buff *skb,
   
         /* Checksum invalid? Ignore.
          * We skip checking packets on the outgoing path
-         * because the semantic of CHECKSUM_HW is different there 
-         * and moreover root might send raw packets.
+         * because the checksum is assumed to be correct.
          */
         /* FIXME: Source route IP option packets --RR */
         if (nf_conntrack_checksum &&
diff --git a/net/netfilter/nf_conntrack_proto_udp.c b/net/netfilter/nf_conntrack_proto_udp.c
index ae07ebe3ab3..d36e03139e8 100644
--- a/net/netfilter/nf_conntrack_proto_udp.c
+++ b/net/netfilter/nf_conntrack_proto_udp.c
@@ -131,8 +131,7 @@ static int udp_error(struct sk_buff *skb, unsigned int dataoff,
 
         /* Checksum invalid? Ignore.
          * We skip checking packets on the outgoing path
-         * because the semantic of CHECKSUM_HW is different there
-         * and moreover root might send raw packets.
+         * because the checksum is assumed to be correct.
          * FIXME: Source route IP option packets --RR */
         if (nf_conntrack_checksum &&
             ((pf == PF_INET && hooknum == NF_IP_PRE_ROUTING) ||
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 49ef41e34c4..eddfbe4441a 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -377,9 +377,9 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
                 break;
         
         case NFQNL_COPY_PACKET:
-                if (entskb->ip_summed == CHECKSUM_HW &&
-                    (*errp = skb_checksum_help(entskb,
-                                               outdev == NULL))) {
+                if ((entskb->ip_summed == CHECKSUM_PARTIAL ||
+                     entskb->ip_summed == CHECKSUM_COMPLETE) &&
+                    (*errp = skb_checksum_help(entskb))) {
                         spin_unlock_bh(&queue->lock);
                         return NULL;
                 }