summaryrefslogtreecommitdiff
path: root/sys/netinet/tcp_subr.c
diff options
context:
space:
mode:
authorAndre Oppermann <andre@FreeBSD.org>2007-05-11 20:52:47 +0000
committerAndre Oppermann <andre@FreeBSD.org>2007-05-11 20:52:47 +0000
commit0489b64c5ed531fa3291a5a17a8b27ceeb5b75d5 (patch)
tree503b36d9340c08dafb82fe89daaf7d1e4cc1fa5f /sys/netinet/tcp_subr.c
parenta9942b1b585c38913fa165884c7e465abad345ca (diff)
Notes
Diffstat (limited to 'sys/netinet/tcp_subr.c')
-rw-r--r--sys/netinet/tcp_subr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index aa2b86dcdf1c..90c2abab8e51 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -653,8 +653,12 @@ tcp_newtcpcb(struct inpcb *inp)
tcp_mssdflt;
/* Set up our timeouts. */
- callout_init_mtx(&tp->t_timers->tt_timer, &inp->inp_mtx,
- CALLOUT_RETURNUNLOCKED);
+ if (NET_CALLOUT_MPSAFE)
+ callout_init_mtx(&tp->t_timers->tt_timer, &inp->inp_mtx,
+ CALLOUT_RETURNUNLOCKED);
+ else
+ callout_init_mtx(&tp->t_timers->tt_timer, &inp->inp_mtx,
+ (CALLOUT_RETURNUNLOCKED|CALLOUT_NETGIANT));
if (tcp_do_rfc1323)
tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP);