aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_stacks/tcp_bbr.h
diff options
context:
space:
mode:
authorRandall Stewart <rrs@FreeBSD.org>2020-05-04 20:28:53 +0000
committerRandall Stewart <rrs@FreeBSD.org>2020-05-04 20:28:53 +0000
commit963fb2ad94a5fa2a4156b738b6ecc6113d366b14 (patch)
tree008725f65ced6fd144bf7f66849810f65ee1e768 /sys/netinet/tcp_stacks/tcp_bbr.h
parentd3b6c96b7dfd20f16785fdbe02141b5a3664290d (diff)
downloadsrc-963fb2ad94a5fa2a4156b738b6ecc6113d366b14.tar.gz
src-963fb2ad94a5fa2a4156b738b6ecc6113d366b14.zip
This commit brings things into sync with the advancements that
have been made in rack and adds a few fixes in BBR. This also removes any possibility of incorrectly doing OOB data the stacks do not support it. Should fix the skyzaller crashes seen in the past. Still to fix is the BBR issue just reported this weekend with the SYN and on sending a RST. Note that this version of rack can now do pacing as well. Sponsored by:Netflix Inc Differential Revision:https://reviews.freebsd.org/D24576
Notes
Notes: svn path=/head/; revision=360639
Diffstat (limited to 'sys/netinet/tcp_stacks/tcp_bbr.h')
-rw-r--r--sys/netinet/tcp_stacks/tcp_bbr.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet/tcp_stacks/tcp_bbr.h b/sys/netinet/tcp_stacks/tcp_bbr.h
index 8c03183c425a..0ba22e17e4f2 100644
--- a/sys/netinet/tcp_stacks/tcp_bbr.h
+++ b/sys/netinet/tcp_stacks/tcp_bbr.h
@@ -1,7 +1,5 @@
/*-
- * Copyright (c) 2016-9
- * Netflix Inc. All rights reserved.
- * Author Randall R. Stewart
+ * Copyright (c) 2016-2020 Netflix, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -748,7 +746,7 @@ struct tcp_bbr {
/* First cache line 0x00 */
int32_t(*r_substate) (struct mbuf *, struct tcphdr *,
struct socket *, struct tcpcb *, struct tcpopt *,
- int32_t, int32_t, uint32_t, int32_t, int32_t); /* Lock(a) */
+ int32_t, int32_t, uint32_t, int32_t, int32_t, uint8_t); /* Lock(a) */
struct tcpcb *rc_tp; /* The tcpcb Lock(a) */
struct inpcb *rc_inp; /* The inpcb Lock(a) */
struct timeval rc_tv;