From 06da46b241b7f469898ce650764b0a946a9335bf Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Thu, 23 Dec 2004 01:27:13 +0000 Subject: [PATCH] Remove an XXXRW comment relating to whether or not the TCP timers are MPSAFE: they are now believed to be. Correct a typo in a second comment. MFC after: 2 weeks --- sys/netinet/tcp_subr.c | 7 +------ sys/netinet/tcp_timewait.c | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 0491f4f6bcae..c55459d286b2 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -596,11 +596,6 @@ tcp_newtcpcb(inp) tcp_mssdflt; /* Set up our timeouts. */ - /* - * XXXRW: Are these actually MPSAFE? I think so, but need to - * review the timed wait code, as it has some list variables, - * etc, that are global. - */ callout_flag = debug_mpsafenet ? CALLOUT_MPSAFE : 0; callout_init(tp->tt_rexmt = &tm->tcpcb_mem_rexmt, callout_flag); callout_init(tp->tt_persist = &tm->tcpcb_mem_persist, callout_flag); @@ -1708,7 +1703,7 @@ tcp_twstart(tp) * that it is safe to recycle this tw socket by returning 1. * * XXXRW: This function should assert the inpcb lock as it does multiple - * non-atomic reads from the tcptw, but is currently * called without it from + * non-atomic reads from the tcptw, but is currently called without it from * in_pcb.c:in_pcblookup_local(). */ int diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index 0491f4f6bcae..c55459d286b2 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -596,11 +596,6 @@ tcp_newtcpcb(inp) tcp_mssdflt; /* Set up our timeouts. */ - /* - * XXXRW: Are these actually MPSAFE? I think so, but need to - * review the timed wait code, as it has some list variables, - * etc, that are global. - */ callout_flag = debug_mpsafenet ? CALLOUT_MPSAFE : 0; callout_init(tp->tt_rexmt = &tm->tcpcb_mem_rexmt, callout_flag); callout_init(tp->tt_persist = &tm->tcpcb_mem_persist, callout_flag); @@ -1708,7 +1703,7 @@ tcp_twstart(tp) * that it is safe to recycle this tw socket by returning 1. * * XXXRW: This function should assert the inpcb lock as it does multiple - * non-atomic reads from the tcptw, but is currently * called without it from + * non-atomic reads from the tcptw, but is currently called without it from * in_pcb.c:in_pcblookup_local(). */ int