diff options
| author | rwatson <rwatson@FreeBSD.org> | 2007-07-28 07:31:30 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2007-07-28 07:31:30 +0000 |
| commit | a62dbe240a72505ede1aa44338d48387b1f57dff (patch) | |
| tree | 53267e076ee890eac40b73468ae3007d9979e4d7 /sys/netinet/tcp_subr.c | |
| parent | dff1b6c68a8d4d1fc50a981e37d4dbf87b06a37a (diff) | |
| download | FreeBSD-src-a62dbe240a72505ede1aa44338d48387b1f57dff.zip FreeBSD-src-a62dbe240a72505ede1aa44338d48387b1f57dff.tar.gz | |
Replace references to NET_CALLOUT_MPSAFE with CALLOUT_MPSAFE, and remove
definition of NET_CALLOUT_MPSAFE, which is no longer required now that
debug.mpsafenet has been removed.
The once over: bz
Approved by: re (kensmith)
Diffstat (limited to 'sys/netinet/tcp_subr.c')
| -rw-r--r-- | sys/netinet/tcp_subr.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 7dfbebb..16d4d92 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -592,12 +592,8 @@ tcp_newtcpcb(struct inpcb *inp) tcp_mssdflt; /* Set up our timeouts. */ - 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)); + callout_init_mtx(&tp->t_timers->tt_timer, &inp->inp_mtx, + CALLOUT_RETURNUNLOCKED); if (tcp_do_rfc1323) tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP); |
