2 files changed, 6 insertions, 47 deletions

diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c
index bc1b83cb8309..72912533a191 100644
--- a/net/ipv4/tcp_offload.c
+++ b/net/ipv4/tcp_offload.c
@@ -288,35 +288,14 @@ static int tcp_v4_gso_send_check(struct sk_buff *skb)
 
 static struct sk_buff **tcp4_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 {
-        /* Use the IP hdr immediately proceeding for this transport */
-        const struct iphdr *iph = skb_gro_network_header(skb);
-        __wsum wsum;
-
         /* Don't bother verifying checksum if we're going to flush anyway. */
-        if (NAPI_GRO_CB(skb)->flush)
-                goto skip_csum;
-
-        wsum = NAPI_GRO_CB(skb)->csum;
-
-        switch (skb->ip_summed) {
-        case CHECKSUM_NONE:
-                wsum = skb_checksum(skb, skb_gro_offset(skb), skb_gro_len(skb),
-                                    0);
-
-                /* fall through */
-
-        case CHECKSUM_COMPLETE:
-                if (!tcp_v4_check(skb_gro_len(skb), iph->saddr, iph->daddr,
-                                  wsum)) {
-                        skb->ip_summed = CHECKSUM_UNNECESSARY;
-                        break;
-                }
-
+        if (!NAPI_GRO_CB(skb)->flush &&
+            skb_gro_checksum_validate(skb, IPPROTO_TCP,
+                                      inet_gro_compute_pseudo)) {
                 NAPI_GRO_CB(skb)->flush = 1;
                 return NULL;
         }
 
-skip_csum:
         return tcp_gro_receive(head, skb);
 }
 
diff --git a/net/ipv6/tcpv6_offload.c b/net/ipv6/tcpv6_offload.c
index 01b0ff9a0c2c..dbb3d9262bf6 100644
--- a/net/ipv6/tcpv6_offload.c
+++ b/net/ipv6/tcpv6_offload.c
@@ -35,34 +35,14 @@ static int tcp_v6_gso_send_check(struct sk_buff *skb)
 static struct sk_buff **tcp6_gro_receive(struct sk_buff **head,
                                          struct sk_buff *skb)
 {
-        const struct ipv6hdr *iph = skb_gro_network_header(skb);
-        __wsum wsum;
-
         /* Don't bother verifying checksum if we're going to flush anyway. */
-        if (NAPI_GRO_CB(skb)->flush)
-                goto skip_csum;
-
-        wsum = NAPI_GRO_CB(skb)->csum;
-
-        switch (skb->ip_summed) {
-        case CHECKSUM_NONE:
-                wsum = skb_checksum(skb, skb_gro_offset(skb), skb_gro_len(skb),
-                                    wsum);
-
-                /* fall through */
-
-        case CHECKSUM_COMPLETE:
-                if (!tcp_v6_check(skb_gro_len(skb), &iph->saddr, &iph->daddr,
-                                  wsum)) {
-                        skb->ip_summed = CHECKSUM_UNNECESSARY;
-                        break;
-                }
-
+        if (!NAPI_GRO_CB(skb)->flush &&
+            skb_gro_checksum_validate(skb, IPPROTO_TCP,
+                                      ip6_gro_compute_pseudo)) {
                 NAPI_GRO_CB(skb)->flush = 1;
                 return NULL;
         }
 
-skip_csum:
         return tcp_gro_receive(head, skb);
 }