Created
June 10, 2018 02:33
-
-
Save kev009/37fe7fb65aee5ae391342b5a18d5015e to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c | |
index 2230e7ab64b..e365934e8f0 100644 | |
--- a/sys/netinet/tcp_stacks/rack.c | |
+++ b/sys/netinet/tcp_stacks/rack.c | |
@@ -6907,34 +6907,8 @@ rack_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, | |
* Initial input (ACK to SYN-ACK etc)lets go ahead and get | |
* it processed | |
*/ | |
- if (ti_locked != TI_RLOCKED && INP_INFO_TRY_RLOCK(&V_tcbinfo)) | |
- ti_locked = TI_RLOCKED; | |
- if (ti_locked != TI_RLOCKED) { | |
- inp = tp->t_inpcb; | |
- tfb = tp->t_fb; | |
- in_pcbref(inp); | |
- INP_WUNLOCK(inp); | |
- INP_INFO_RLOCK(&V_tcbinfo); | |
- ti_locked = TI_RLOCKED; | |
- INP_WLOCK(inp); | |
- if (in_pcbrele_wlocked(inp)) | |
- inp = NULL; | |
- if (inp == NULL || (inp->inp_flags2 & INP_FREED) || | |
- (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED))) { | |
- /* The TCPCB went away. Free the packet. */ | |
- INP_INFO_RUNLOCK(&V_tcbinfo); | |
- if (inp) | |
- INP_WUNLOCK(inp); | |
- m_freem(m); | |
- return; | |
- } | |
- /* If the stack changed, call the correct stack. */ | |
- if (tp->t_fb != tfb) { | |
- tp->t_fb->tfb_tcp_do_segment(m, th, so, tp, | |
- drop_hdrlen, tlen, iptos, ti_locked); | |
- return; | |
- } | |
- } | |
+ INP_INFO_RLOCK(); | |
+ ti_locked = TI_RLOCKED; | |
tcp_get_usecs(&tv); | |
rack_hpts_do_segment(m, th, so, tp, drop_hdrlen, | |
tlen, iptos, ti_locked, 0, &tv); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment