net: drop thunderx patches n/a for 4.12

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

3 files changed, 0 insertions, 83 deletions

diff --git a/queue/net-thunderx-Fix-TCP-UDP-checksum-offload-for-IPv4-p.patch b/queue/net-thunderx-Fix-TCP-UDP-checksum-offload-for-IPv4-p.patch
deleted file mode 100644
index a4dab3b..0000000
--- a/queue/net-thunderx-Fix-TCP-UDP-checksum-offload-for-IPv4-p.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 134059fd2775be79e26c2dff87d25cc2f6ea5626 Mon Sep 17 00:00:00 2001
-From: Florian Westphal <fw@strlen.de>
-Date: Wed, 6 Dec 2017 01:04:50 +0100
-Subject: [PATCH] net: thunderx: Fix TCP/UDP checksum offload for IPv4 pkts
-
-commit 134059fd2775be79e26c2dff87d25cc2f6ea5626 upstream.
-
-Offload IP header checksum to NIC.
-
-This fixes a previous patch which disabled checksum offloading
-for both IPv4 and IPv6 packets.  So L3 checksum offload was
-getting disabled for IPv4 pkts.  And HW is dropping these pkts
-for some reason.
-
-Without this patch, IPv4 TSO appears to be broken:
-
-WIthout this patch I get ~16kbyte/s, with patch close to 2mbyte/s
-when copying files via scp from test box to my home workstation.
-
-Looking at tcpdump on sender it looks like hardware drops IPv4 TSO skbs.
-This patch restores performance for me, ipv6 looks good too.
-
-Fixes: fa6d7cb5d76c ("net: thunderx: Fix TCP/UDP checksum offload for IPv6 pkts")
-Cc: Sunil Goutham <sgoutham@cavium.com>
-Cc: Aleksey Makarov <aleksey.makarov@auriga.com>
-Cc: Eric Dumazet <edumazet@google.com>
-Signed-off-by: Florian Westphal <fw@strlen.de>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-index 8b2c31e2a2b0..a3d12dbde95b 100644
---- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-@@ -1355,6 +1355,8 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry,
- 
- 	/* Offload checksum calculation to HW */
- 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
-+		if (ip.v4->version == 4)
-+			hdr->csum_l3 = 1; /* Enable IP csum calculation */
- 		hdr->l3_offset = skb_network_offset(skb);
- 		hdr->l4_offset = skb_transport_offset(skb);
- 
--- 
-2.15.0
-
diff --git a/queue/net-thunderx-Fix-TCP-UDP-checksum-offload-for-IPv6-p.patch b/queue/net-thunderx-Fix-TCP-UDP-checksum-offload-for-IPv6-p.patch
deleted file mode 100644
index a98caf4..0000000
--- a/queue/net-thunderx-Fix-TCP-UDP-checksum-offload-for-IPv6-p.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From fa6d7cb5d76cf0467c61420fc9238045aedfd379 Mon Sep 17 00:00:00 2001
-From: Sunil Goutham <sgoutham@cavium.com>
-Date: Thu, 23 Nov 2017 22:34:31 +0300
-Subject: [PATCH] net: thunderx: Fix TCP/UDP checksum offload for IPv6 pkts
-
-commit fa6d7cb5d76cf0467c61420fc9238045aedfd379 upstream.
-
-Don't offload IP header checksum to NIC.
-
-This fixes a previous patch which enabled checksum offloading
-for both IPv4 and IPv6 packets.  So L3 checksum offload was
-getting enabled for IPv6 pkts.  And HW is dropping these pkts
-as it assumes the pkt is IPv4 when IP csum offload is set
-in the SQ descriptor.
-
-Fixes:  3a9024f52c2e ("net: thunderx: Enable TSO and checksum offloads for ipv6")
-Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
-Signed-off-by: Aleksey Makarov <aleksey.makarov@auriga.com>
-Reviewed-by: Eric Dumazet <edumazet@google.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-index d4496e9afcdf..8b2c31e2a2b0 100644
---- a/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-+++ b/drivers/net/ethernet/cavium/thunder/nicvf_queues.c
-@@ -1355,7 +1355,6 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry,
- 
- 	/* Offload checksum calculation to HW */
- 	if (skb->ip_summed == CHECKSUM_PARTIAL) {
--		hdr->csum_l3 = 1; /* Enable IP csum calculation */
- 		hdr->l3_offset = skb_network_offset(skb);
- 		hdr->l4_offset = skb_transport_offset(skb);
- 
--- 
-2.15.0
-
diff --git a/queue/series b/queue/series
index d49d42e..9e7def7 100644
--- a/queue/series
+++ b/queue/series
@@ -111,8 +111,6 @@ net-packet-fix-a-race-in-packet_bind-and-packet_noti.patch
 net-qmi_wwan-add-Quectel-BG96-2c7c-0296.patch
 net-realtek-r8169-implement-set_link_ksettings.patch
 net-remove-hlist_nulls_add_tail_rcu.patch
-net-thunderx-Fix-TCP-UDP-checksum-offload-for-IPv4-p.patch
-net-thunderx-Fix-TCP-UDP-checksum-offload-for-IPv6-p.patch
 powerpc-powernv-idle-Round-up-latency-and-residency-.patch
 RDMA-cxgb4-Annotate-r2-and-stag-as-__be32.patch
 rds-Fix-NULL-pointer-dereference-in-__rds_rdma_map.patch