diff options
| author | rwatson <rwatson@FreeBSD.org> | 2010-06-03 09:06:50 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2010-06-03 09:06:50 +0000 |
| commit | 02e08d892494f82d3eb06e81197a0f304d9b6fcc (patch) | |
| tree | 21374fdf4aab9fff3a66c47524c51a5050506ac5 /sys/netinet | |
| parent | 3b8e381c89f29ce729c133d16f6108e96d51a70f (diff) | |
| download | FreeBSD-src-02e08d892494f82d3eb06e81197a0f304d9b6fcc.zip FreeBSD-src-02e08d892494f82d3eb06e81197a0f304d9b6fcc.tar.gz | |
Merge r204830 from head to stable/8
Locking the tcbinfo structure should not be necessary in tcp_timer_delack(),
so don't.
Reviewed by: bz
Sponsored by: Juniper Networks
Approved by: re (kib)
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_timer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c index 7f5d159..24801d2 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); |
