Page MenuHomeFreeBSD
Files F116048656

D42386.diff
No OneTemporary
Actions

D42386.diff
View Options

diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -7472,7 +7472,7 @@
(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 @@
* 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 @@
(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 @@
(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 @@
(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 @@
(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 @@
}
/*
* 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 @@
(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 @@
(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 @@
}
#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 @@
}
#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
diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h
--- a/sys/netinet/tcp_stacks/tcp_rack.h
+++ b/sys/netinet/tcp_stacks/tcp_rack.h
@@ -120,7 +120,6 @@
}
-RB_HEAD(rack_rb_tree_head, rack_sendmap);
TAILQ_HEAD(rack_head, rack_sendmap);
TAILQ_HEAD(def_opt_head, deferred_opt_list);

File Metadata

Mime Type
text/plain
Expires
Sat, May 3, 1:51 AM (12 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17916803
Default Alt Text
D42386.diff (3 KB)

Event Timeline