upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 01:30:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcp: Use sbuf_drain unconditionally

Browse source 
After making sbuf_drain safe for external use,
there is no need to protect the call.

MFC after: 2 weeks
Reviewed By: tuexen, #transport
Sponsored by: NetApp, Inc.
Differential Revision: https://reviews.freebsd.org/D29545

(cherry picked from commit 38ea2bd069)
(cherry picked from commit a04906f027)
This commit is contained in:
Richard Scheffenegger 2021-04-02 20:26:48 +02:00
parent 9f38350130
commit e5bbb777cb
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/netinet/tcp_hostcache.c
View file

@ -644,7 +644,6 @@ sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS)
const int linesize = 128;
struct sbuf sb;
int i, error, len;
bool do_drain = false;
struct hc_metrics *hc_entry;
char ip4buf[INET_ADDRSTRLEN];
#ifdef INET6
@ -702,16 +701,9 @@ sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS)
hc_entry->rmx_hits,
hc_entry->rmx_updates,
hc_entry->rmx_expire);
do_drain = true;
}
THC_UNLOCK(&V_tcp_hostcache.hashbase[i].hch_mtx);
/* Need to track if sbuf has data, to avoid
* a KASSERT when calling sbuf_drain.
*/
if (do_drain) {
sbuf_drain(&sb);
do_drain = false;
}
sbuf_drain(&sb);
}
#undef msec
error = sbuf_finish(&sb);