upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcp rack: remove references to rb trees

Browse source 
The references should have been removed in
https://cgit.freebsd.org/src/commit/?id=030434acaf4631c4e205f8bccedcc7f845cbfcbf

Reviewed by:		rscheff, zlei
Sponsored by:		Netflix, Inc.
Differential Revision:	https://reviews.freebsd.org/D42386

(cherry picked from commit b10ae5a9b21aa11e96a1951ccc4525dd1fdb60b3)
This commit is contained in:
Michael Tuexen 2023-11-05 15:21:06 +01:00
parent 54190b5e8d
commit 9a75f1475f
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sys/netinet/tcp_stacks/rack.c
View file

@ -7472,7 +7472,7 @@ need_retran:
(void)tqhash_insert(rack->r_ctl.tqh, nrsm);
#else
if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) {
panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p",
panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p",
nrsm, insret, rack, rsm);
}
#endif
@ -7692,8 +7692,8 @@ rack_remxt_tmr(struct tcpcb *tp)
* order. This way we send in the proper order and any
* sacks that come floating in will "re-ack" the data.
* To do this we zap the tmap with an INIT and then
* walk through and place every rsm in the RB tree
* back in its seq ordered place.
* walk through and place every rsm in the tail queue
* hash table back in its seq ordered place.
*/
TAILQ_INIT(&rack->r_ctl.rc_tmap);
@ -8355,7 +8355,7 @@ rack_update_entry(struct tcpcb *tp, struct tcp_rack *rack,
(void)tqhash_insert(rack->r_ctl.tqh, nrsm);
#else
if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) {
panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p",
panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p",
nrsm, insret, rack, rsm);
}
#endif
@ -8545,7 +8545,7 @@ again:
(void)tqhash_insert(rack->r_ctl.tqh, rsm);
#else
if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) {
panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p",
panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p",
nrsm, insret, rack, rsm);
}
#endif
@ -8619,7 +8619,7 @@ refind:
(void)tqhash_insert(rack->r_ctl.tqh, nrsm);
#else
if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) {
panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p",
panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p",
nrsm, insret, rack, rsm);
}
#endif
@ -9776,7 +9776,7 @@ do_rest_ofb:
(void)tqhash_insert(rack->r_ctl.tqh, nrsm);
#else
if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) {
panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p",
panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p",
nrsm, insret, rack, rsm);
}
#endif
@ -9897,7 +9897,7 @@ do_rest_ofb:
}
/*
* There is more not coverend by this rsm move on
* to the next block in the RB tree.
* to the next block in the tail queue hash table.
*/
nrsm = tqhash_next(rack->r_ctl.tqh, rsm);
start = rsm->r_end;
@ -10138,7 +10138,7 @@ do_rest_ofb:
(void)tqhash_insert(rack->r_ctl.tqh, nrsm);
#else
if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) {
panic("Insert in rb tree of %p fails ret:% rack:%p rsm:%p",
panic("Insert in tailq_hash of %p fails ret:% rack:%p rsm:%p",
nrsm, insret, rack, rsm);
}
#endif
@ -12478,7 +12478,7 @@ rack_un_collapse_window(struct tcp_rack *rack, int line)
(void)tqhash_insert(rack->r_ctl.tqh, nrsm);
#else
if ((insret = tqhash_insert(rack->r_ctl.tqh, nrsm)) != 0) {
panic("Insert in rb tree of %p fails ret:%d rack:%p rsm:%p",
panic("Insert in tailq_hash of %p fails ret:%d rack:%p rsm:%p",
nrsm, insret, rack, rsm);
}
#endif
@ -14808,7 +14808,7 @@ rack_init_outstanding(struct tcpcb *tp, struct tcp_rack *rack, uint32_t us_cts,
}
#ifdef INVARIANTS
if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) {
panic("Insert in rb tree fails ret:%d rack:%p rsm:%p",
panic("Insert in tailq_hash fails ret:%d rack:%p rsm:%p",
insret, rack, rsm);
}
#else
@ -14868,7 +14868,7 @@ rack_init_outstanding(struct tcpcb *tp, struct tcp_rack *rack, uint32_t us_cts,
}
#ifdef INVARIANTS
if ((insret = tqhash_insert(rack->r_ctl.tqh, rsm)) != 0) {
panic("Insert in rb tree fails ret:%d rack:%p rsm:%p",
panic("Insert in tailq_hash fails ret:%d rack:%p rsm:%p",
insret, rack, rsm);
}
#else

1
sys/netinet/tcp_stacks/tcp_rack.h
View file

@ -120,7 +120,6 @@ rack_ts_to_msec(uint64_t ts)
}
RB_HEAD(rack_rb_tree_head, rack_sendmap);
TAILQ_HEAD(rack_head, rack_sendmap);
TAILQ_HEAD(def_opt_head, deferred_opt_list);