77 lines
2.3 KiB
Diff
77 lines
2.3 KiB
Diff
From 590873482f9b6a5e2635a95720acb37b5f516ab0 Mon Sep 17 00:00:00 2001
|
|
From: kircher <majun65@huawei.com>
|
|
Date: Tue, 21 Feb 2023 15:05:41 +0800
|
|
Subject: [PATCH] lwip add need_tso_send
|
|
|
|
---
|
|
src/api/api_msg.c | 1 +
|
|
src/core/tcp_out.c | 5 ++++-
|
|
src/include/lwip/tcp.h | 2 ++
|
|
3 files changed, 7 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/api/api_msg.c b/src/api/api_msg.c
|
|
index 1fedaad..3a4a473 100644
|
|
--- a/src/api/api_msg.c
|
|
+++ b/src/api/api_msg.c
|
|
@@ -1744,6 +1744,7 @@ lwip_netconn_do_writemore(struct netconn *conn WRITE_DELAYED_PARAM)
|
|
write_more = 0;
|
|
err = tcp_write(conn->pcb.tcp, conn->current_msg->msg.w.vector->ptr, len, apiflags);
|
|
conn->current_msg->msg.w.len = len;
|
|
+ conn->pcb.tcp->need_tso_send = 1;
|
|
#else
|
|
err = tcp_write(conn->pcb.tcp, dataptr, len, apiflags);
|
|
#endif
|
|
diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c
|
|
index c538f2a..bf23381 100644
|
|
--- a/src/core/tcp_out.c
|
|
+++ b/src/core/tcp_out.c
|
|
@@ -1473,7 +1473,7 @@ tcp_output(struct tcp_pcb *pcb)
|
|
|
|
u32_t send_len = 0;
|
|
#if USE_LIBOS
|
|
- if (get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_TSO) {
|
|
+ if ((get_eth_params_tx_ol() & DEV_TX_OFFLOAD_TCP_TSO) && pcb->need_tso_send) {
|
|
while(seg && send_len < 0xffff) {
|
|
/**
|
|
* 1) walk unsent queue, find all seg witch wait to send. chain buf in these segs.
|
|
@@ -1529,6 +1529,7 @@ tcp_output(struct tcp_pcb *pcb)
|
|
if (err != ERR_OK) {
|
|
if (pcb->unsent == NULL)
|
|
pcb->last_unsent = NULL;
|
|
+ pcb->need_tso_send = 0;
|
|
return err;
|
|
}
|
|
pcb->unsent = seg->next;
|
|
@@ -1552,6 +1553,7 @@ tcp_output(struct tcp_pcb *pcb)
|
|
pbuf_remove_header(new_seg.p, new_seg.p->tot_len - new_seg.len - TCPH_HDRLEN_BYTES(new_seg.tcphdr));
|
|
new_seg.p->tot_len = new_seg.p->len;
|
|
}
|
|
+ pcb->need_tso_send = 0;
|
|
} else
|
|
#endif
|
|
{
|
|
@@ -1647,6 +1649,7 @@ tcp_output(struct tcp_pcb *pcb)
|
|
#endif /* TCP_OVERSIZE */
|
|
|
|
output_done:
|
|
+ pcb->need_tso_send = 0;
|
|
if (pcb->unsent == NULL)
|
|
pcb->last_unsent = NULL;
|
|
tcp_clear_flags(pcb, TF_NAGLEMEMERR);
|
|
diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h
|
|
index 0b65b01..2fc683d 100644
|
|
--- a/src/include/lwip/tcp.h
|
|
+++ b/src/include/lwip/tcp.h
|
|
@@ -409,6 +409,8 @@ struct tcp_pcb {
|
|
u8_t snd_scale;
|
|
u8_t rcv_scale;
|
|
#endif
|
|
+
|
|
+ u8_t need_tso_send;
|
|
};
|
|
|
|
#if TCP_PCB_HASH
|
|
--
|
|
2.33.0
|
|
|