X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=net%2Fipv4%2Fip_gre.c;h=4e9c74b54b150b3cec895023b2489d104866c710;hb=fb286bb2990a107009dbf25f6ffebeb7df77f9be;hp=896ce3f8f53addd02db7e6beaaa205a7275da262;hpb=1064e944d03eb7a72c0fa11236d5e69cfd877a71;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 896ce3f8f53a..4e9c74b54b15 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -577,15 +577,16 @@ static int ipgre_rcv(struct sk_buff *skb)
 			goto drop_nolock;
 
 		if (flags&GRE_CSUM) {
-			if (skb->ip_summed == CHECKSUM_HW) {
+			switch (skb->ip_summed) {
+			case CHECKSUM_HW:
 				csum = (u16)csum_fold(skb->csum);
-				if (csum)
-					skb->ip_summed = CHECKSUM_NONE;
-			}
-			if (skb->ip_summed == CHECKSUM_NONE) {
-				skb->csum = skb_checksum(skb, 0, skb->len, 0);
+				if (!csum)
+					break;
+				/* fall through */
+			case CHECKSUM_NONE:
+				skb->csum = 0;
+				csum = __skb_checksum_complete(skb);
 				skb->ip_summed = CHECKSUM_HW;
-				csum = (u16)csum_fold(skb->csum);
 			}
 			offset += 4;
 		}