Page MenuHomeFreeBSD
Files F113882033

D44157.diff
No OneTemporary
Actions

D44157.diff
View Options

diff --git a/sys/netinet/tcp_hpts.h b/sys/netinet/tcp_hpts.h
--- a/sys/netinet/tcp_hpts.h
+++ b/sys/netinet/tcp_hpts.h
@@ -115,7 +115,9 @@
static inline bool
tcp_in_hpts(struct tcpcb *tp)
{
- return (tp->t_in_hpts == IHPTS_ONQUEUE);
+ return ((tp->t_in_hpts == IHPTS_ONQUEUE) ||
+ ((tp->t_in_hpts == IHPTS_MOVING) &&
+ (tp->t_hpts_slot != -1)));
}
/*
@@ -208,6 +210,17 @@
return (tcp_tv_to_hptstick(sv));
}
+static __inline uint64_t
+tcp_get_u64_usecs(struct timeval *tv)
+{
+ struct timeval tvd;
+
+ if (tv == NULL)
+ tv = &tvd;
+ microuptime(tv);
+ return (tcp_tv_to_lusectick(tv));
+}
+
static __inline uint32_t
tcp_get_usecs(struct timeval *tv)
{
diff --git a/sys/netinet/tcp_hpts.c b/sys/netinet/tcp_hpts.c
--- a/sys/netinet/tcp_hpts.c
+++ b/sys/netinet/tcp_hpts.c
@@ -820,7 +820,7 @@
INP_WLOCK_ASSERT(tptoinpcb(tp));
MPASS(!(tptoinpcb(tp)->inp_flags & INP_DROPPED));
- MPASS(!tcp_in_hpts(tp));
+ MPASS(!(tp->t_in_hpts == IHPTS_ONQUEUE));
/*
* We now return the next-slot the hpts will be on, beyond its

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 6, 1:12 AM (1 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17399068
Default Alt Text
D44157.diff (1 KB)

Event Timeline