The branch main has been updated by dim:
URL:
https://cgit.FreeBSD.org/src/commit/?id=762489657117037d963aa840374280583acd32c2
commit 762489657117037d963aa840374280583acd32c2
Author: Dimitry Andric <d...@freebsd.org>
AuthorDate: 2022-08-14 19:06:07 +0000
Commit: Dimitry Andric <d...@freebsd.org>
CommitDate: 2022-08-14 19:27:34 +0000
Fix unused variable warning in tcp_stacks's bbr.c
With clang 15, the following -Werror warning is produced:
sys/netinet/tcp_stacks/bbr.c:11925:11: error: variable 'rtr_cnt' set but
not used [-Werror,-Wunused-but-set-variable]
uint32_t rtr_cnt = 0;
^
The 'rtr_cnt' variable was in bbr.c when it was first added, but it
appears to have been a debugging aid that has never been used, so remove
it.
MFC after: 3 days
---
sys/netinet/tcp_stacks/bbr.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c
index 9d5a3d52776e..47c7f1ee0eee 100644
--- a/sys/netinet/tcp_stacks/bbr.c
+++ b/sys/netinet/tcp_stacks/bbr.c
@@ -11922,7 +11922,6 @@ bbr_output_wtime(struct tcpcb *tp, const struct timeval
*tv)
int32_t prefetch_so_done = 0;
int32_t prefetch_rsm = 0;
uint32_t tot_len = 0;
- uint32_t rtr_cnt = 0;
uint32_t maxseg, pace_max_segs, p_maxseg;
int32_t csum_flags = 0;
int32_t hw_tls;
@@ -12242,7 +12241,6 @@ recheck_resend:
goto recheck_resend;
#endif
}
- rtr_cnt++;
if (rsm->r_flags & BBR_HAS_SYN) {
/* Only retransmit a SYN by itself */
len = 0;
@@ -12291,7 +12289,6 @@ recheck_resend:
bbr->r_ctl.rc_tlp_send = NULL;
sack_rxmit = 1;
len = rsm->r_end - rsm->r_start;
- rtr_cnt++;
if ((bbr->rc_resends_use_tso == 0) && (len > maxseg))
len = maxseg;
