From ed9b7bf3be385ed22fa1470216e1ce910cca20dc Mon Sep 17 00:00:00 2001
From: openharmony_ci <120357966@qq.com>
Date: Sat, 15 Apr 2023 07:59:47 +0000
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!71=20:?=
 =?UTF-8?q?=20Fix=20NewIP=20ofo=20last=5Fskb=20issues'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/linux/net/newip/tcp_nip_input.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/linux/net/newip/tcp_nip_input.c b/src/linux/net/newip/tcp_nip_input.c
index 4e92daa..0e3b1ff 100644
--- a/src/linux/net/newip/tcp_nip_input.c
+++ b/src/linux/net/newip/tcp_nip_input.c
@@ -340,15 +340,7 @@ coalesce_done:
 		goto insert;
 	}
 
-	if (!before(seq, TCP_SKB_CB(tp->ooo_last_skb)->seq)) {
-		if (!after(end_seq, TCP_SKB_CB(tp->ooo_last_skb)->end_seq)) {
-			/* ooo_last_skb->seq <= seq, end_seq <= ooo_last_skb->end_seq */
-			nip_dbg("ooo_last_skb completely overlapping new skb, drop pkt");
-			NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE);
-			tcp_nip_drop(sk, skb);
-			skb = NULL;
-			goto end;
-		}
+	if (after(seq, TCP_SKB_CB(tp->ooo_last_skb)->seq)) {
 		tcp_nip_left_overlap(skb, tp->ooo_last_skb);
 		if (tcp_nip_ooo_try_coalesce(sk, tp->ooo_last_skb, skb, &fragstolen)) {
 			nip_dbg("ofo skb coalesce ooo_last_skb done");
-- 
Gitee