aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_gre.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-08-29 19:44:56 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 17:53:53 -0400
commit84fa7933a33f806bbbaae6775e87459b1ec584c0 (patch)
tree5be404225d90f640997b12f631e9b496b3fd0d61 /net/ipv4/ip_gre.c
parent8584d6df39db5601965f9bc5e3bf2fea833ad7bb (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 'net/ipv4/ip_gre.c')
-rw-r--r--net/ipv4/ip_gre.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 0f9b3a31997b..e66f6ff2e198 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -576,7 +576,7 @@ static int ipgre_rcv(struct sk_buff *skb)
576 576
577 if (flags&GRE_CSUM) { 577 if (flags&GRE_CSUM) {
578 switch (skb->ip_summed) { 578 switch (skb->ip_summed) {
579 case CHECKSUM_HW: 579 case CHECKSUM_COMPLETE:
580 csum = (u16)csum_fold(skb->csum); 580 csum = (u16)csum_fold(skb->csum);
581 if (!csum) 581 if (!csum)
582 break; 582 break;
@@ -584,7 +584,7 @@ static int ipgre_rcv(struct sk_buff *skb)
584 case CHECKSUM_NONE: 584 case CHECKSUM_NONE:
585 skb->csum = 0; 585 skb->csum = 0;
586 csum = __skb_checksum_complete(skb); 586 csum = __skb_checksum_complete(skb);
587 skb->ip_summed = CHECKSUM_HW; 587 skb->ip_summed = CHECKSUM_COMPLETE;
588 } 588 }
589 offset += 4; 589 offset += 4;
590 } 590 }