summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2010-03-07 14:23:44 +0000
committerrwatson <rwatson@FreeBSD.org>2010-03-07 14:23:44 +0000
commit7502c4d558be205267f69cdc2249cd69789265f1 (patch)
treee9d97fee19346b05b179f78cb3317d175a0eb89f
parent14fa088a3b79560a24f867cecd360695a7420d60 (diff)
downloadFreeBSD-src-7502c4d558be205267f69cdc2249cd69789265f1.zip
FreeBSD-src-7502c4d558be205267f69cdc2249cd69789265f1.tar.gz
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
-rw-r--r--sys/netinet/tcp_timer.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index 8ead3dc..6192614 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);
OpenPOWER on IntegriCloud