Blame SOURCES/9007-Revert-netdrv-ionic-use-new-helper-tcp_v6_gso_csum_prep.patch

1632d2
From 15d95cc39f17d6edccdbbbabdb105055d420baa9 Mon Sep 17 00:00:00 2001
1632d2
From: Jonathan Toppins <jtoppins@redhat.com>
1632d2
Date: Tue, 28 Apr 2020 19:08:30 -0400
1632d2
Subject: [PATCH] [netdrv] ionic: use new helper tcp_v6_gso_csum_prep
1632d2
1632d2
Message-id: <703cf10dc3ec18f4b7ccd734863ba19c26039bb6.1588100139.git.jtoppins@redhat.com>
1632d2
Patchwork-id: 305675
1632d2
Patchwork-instance: patchwork
1632d2
O-Subject: [PATCH RHEL-8.3 46/84] ionic: use new helper tcp_v6_gso_csum_prep
1632d2
Bugzilla: 1780645
1632d2
RH-Acked-by: John Linville <linville@redhat.com>
1632d2
RH-Acked-by: Corinna Vinschen <vinschen@redhat.com>
1632d2
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
1632d2
1632d2
Use new helper tcp_v6_gso_csum_prep in additional network drivers.
1632d2
1632d2
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
1632d2
Acked-by: Shannon Nelson <snelson@pensando.io>
1632d2
Signed-off-by: David S. Miller <davem@davemloft.net>
1632d2
(cherry picked from commit fa6b84295225b96bed9321301f218eda6ca73edc)
1632d2
Bugzilla: 1780645
1632d2
Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=28076826
1632d2
Tested: partner and local testing show driver seems to work as expected
1632d2
Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
1632d2
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
1632d2
---
1632d2
 drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 5 +----
1632d2
 1 file changed, 1 insertion(+), 4 deletions(-)
1632d2
1632d2
Index: src/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
1632d2
===================================================================
1632d2
--- src.orig/drivers/net/ethernet/pensando/ionic/ionic_txrx.c	2020-06-28 19:17:54.295943746 +0200
1632d2
+++ src/drivers/net/ethernet/pensando/ionic/ionic_txrx.c	2020-06-28 19:18:08.537961935 +0200
1632d2
@@ -657,7 +657,10 @@
1632d2
 					   ip_hdr(skb)->daddr,
1632d2
 					   0, IPPROTO_TCP, 0);
1632d2
 	} else if (skb->protocol == cpu_to_be16(ETH_P_IPV6)) {
1632d2
-		tcp_v6_gso_csum_prep(skb);
1632d2
+		tcp_hdr(skb)->check =
1632d2
+			~csum_ipv6_magic(&ipv6_hdr(skb)->saddr,
1632d2
+					 &ipv6_hdr(skb)->daddr,
1632d2
+					 0, IPPROTO_TCP, 0);
1632d2
 	}
1632d2
 
1632d2
 	return 0;