The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=84b42df8345bef75c2ffbd4830c2d2e17ea1cdb4
commit 84b42df8345bef75c2ffbd4830c2d2e17ea1cdb4 Author: Gleb Smirnoff <[email protected]> AuthorDate: 2023-04-04 23:35:36 +0000 Commit: Gleb Smirnoff <[email protected]> CommitDate: 2023-04-04 23:35:36 +0000 rack: fix build on powerpc --- sys/netinet/tcp_stacks/rack.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 514d10098ff6..3fc0bb65bbf8 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -5505,7 +5505,8 @@ do_rack_check_for_unclamp(struct tcpcb *tp, struct tcp_rack *rack) if ((rack_unclamp_round_thresh > 0) && (rnds >= rack_unclamp_round_thresh)) { snds = tp->t_sndbytes - rack->r_ctl.last_sndbytes; - KASSERT ((snds > 0), ("rack:%p tp:%p snds:%lu is 0", rack, tp, snds)); + KASSERT ((snds > 0), ("rack:%p tp:%p snds:%ju is 0", rack, tp, + (uintmax_t)snds)); rxts = tp->t_snd_rxt_bytes - rack->r_ctl.last_snd_rxt_bytes; rxt_per = rxts * 1000; rxt_per /= snds; @@ -7033,10 +7034,10 @@ rack_adjust_orig_mlen(struct rack_sendmap *rsm) * compensate for this change. */ KASSERT((rsm->orig_t_space > M_TRAILINGROOM(rsm->m)), - ("mbuf:%p rsm:%p trailing_space:%lu ots:%u oml:%u mlen:%u\n", + ("mbuf:%p rsm:%p trailing_space:%jd ots:%u oml:%u mlen:%u\n", rsm->m, rsm, - M_TRAILINGROOM(rsm->m), + (intmax_t)M_TRAILINGROOM(rsm->m), rsm->orig_t_space, rsm->orig_m_len, rsm->m->m_len)); @@ -18248,10 +18249,10 @@ rack_fo_m_copym(struct tcp_rack *rack, int32_t *plen, * compensate for this change. */ KASSERT((rack->r_ctl.fsb.o_t_len > M_TRAILINGROOM(m)), - ("mbuf:%p rack:%p trailing_space:%lu ots:%u oml:%u mlen:%u\n", + ("mbuf:%p rack:%p trailing_space:%jd ots:%u oml:%u mlen:%u\n", m, rack, - M_TRAILINGROOM(m), + (intmax_t)M_TRAILINGROOM(m), rack->r_ctl.fsb.o_t_len, rack->r_ctl.fsb.o_m_len, m->m_len));
