From 1f821c53f0e31b6bfec2b0cdd4d932ee6e9690d6 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sun, 7 Mar 2010 14:23:44 +0000 Subject: [PATCH] Locking the tcbinfo structure should not be necessary in tcp_timer_delack(), so don't. MFC after: 1 week Reviewed by: bz Sponsored by: Juniper Networks --- sys/netinet/tcp_timer.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 8ead3dc36901..61926145f528 100644 --- a/sys/netinet/tcp_timer.c +++ b/sys/netinet/tcp_timer.c @@ -162,7 +162,6 @@ tcp_timer_delack(void *xtp) struct inpcb *inp; CURVNET_SET(tp->t_vnet); - INP_INFO_RLOCK(&V_tcbinfo); inp = tp->t_inpcb; /* * XXXRW: While this assert is in fact correct, bugs in the tcpcb @@ -173,12 +172,10 @@ tcp_timer_delack(void *xtp) */ if (inp == NULL) { tcp_timer_race++; - INP_INFO_RUNLOCK(&V_tcbinfo); CURVNET_RESTORE(); return; } INP_WLOCK(inp); - INP_INFO_RUNLOCK(&V_tcbinfo); if ((inp->inp_flags & INP_DROPPED) || callout_pending(&tp->t_timers->tt_delack) || !callout_active(&tp->t_timers->tt_delack)) { INP_WUNLOCK(inp);