git: 5c855665a04e - releng/14.0 - cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 16 Oct 2023 23:05:16 UTC
The branch releng/14.0 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=5c855665a04ea950bc98e92f3a78f2a4d9988a3d
commit 5c855665a04ea950bc98e92f3a78f2a4d9988a3d
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-09-08 23:31:38 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-10-16 23:04:33 +0000
cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp
Similar to dcfddc8dc091e7688abc8488a0307eba425fa7a2, replace the
simpler, inlined version with the full version.
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D41690
(cherry picked from commit 897e564361624411c4e557e0817642e1477f0af4)
(cherry picked from commit 969dc06e919ca135fdbf5c9a760684c357ae9310)
Approved by: re (karels)
---
sys/dev/cxgbe/tom/t4_tls.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c
index 29a840067c62..3a0c1a392e6c 100644
--- a/sys/dev/cxgbe/tom/t4_tls.c
+++ b/sys/dev/cxgbe/tom/t4_tls.c
@@ -794,7 +794,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
struct mbuf *tls_data;
struct tls_get_record *tgr;
struct mbuf *control;
- int pdu_length, rx_credits, trailer_len;
+ int pdu_length, trailer_len;
#if defined(KTR) || defined(INVARIANTS)
int len;
#endif
@@ -975,16 +975,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
sbappendcontrol_locked(sb, m, control, 0);
else
sbappendstream_locked(sb, m, 0);
- rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0;
-#ifdef VERBOSE_TRACES
- CTR4(KTR_CXGBE, "%s: tid %u rx_credits %u rcv_wnd %u",
- __func__, tid, rx_credits, tp->rcv_wnd);
-#endif
- if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) {
- rx_credits = send_rx_credits(sc, toep, rx_credits);
- tp->rcv_wnd += rx_credits;
- tp->rcv_adv += rx_credits;
- }
+ t4_rcvd_locked(&toep->td->tod, tp);
sorwakeup_locked(so);
SOCKBUF_UNLOCK_ASSERT(sb);