回退 'Pull Request !71 : Fix NewIP ofo last_skb issues'

This commit is contained in:
openharmony_ci
2023-04-15 07:59:47 +00:00
committed by Gitee
parent 24da81f7af
commit ed9b7bf3be
+1 -9
View File
@@ -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");