diff options
| author | Michael Tuexen <tuexen@FreeBSD.org> | 2020-06-07 14:39:20 +0000 |
|---|---|---|
| committer | Michael Tuexen <tuexen@FreeBSD.org> | 2020-06-07 14:39:20 +0000 |
| commit | 70486b27ae87905ba07b8dcd2e260500e5d2e89e (patch) | |
| tree | 06bf6d6129242dbc38d26391b0dfad75201c15b6 /sys/netinet6 | |
| parent | 90b9aa475e9e80845dd6bbde40e749ae72c11557 (diff) | |
| download | src-70486b27ae87905ba07b8dcd2e260500e5d2e89e.tar.gz src-70486b27ae87905ba07b8dcd2e260500e5d2e89e.zip | |
Retire SCTP_SO_LOCK_TESTING.
This was intended to test the locking used in the MacOS X kernel on a
FreeBSD system, to make use of WITNESS and other debugging infrastructure.
This hasn't been used for ages, to take it out to reduce the #ifdef
complexity.
MFC after: 1 week
Notes
Notes:
svn path=/head/; revision=361895
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/sctp6_usrreq.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 3543a1ea4454..525bed2366d2 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -179,9 +179,6 @@ sctp6_notify(struct sctp_inpcb *inp, uint8_t icmp6_code, uint32_t next_mtu) { -#if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) - struct socket *so; -#endif int timer_stopped; switch (icmp6_type) { @@ -205,19 +202,8 @@ sctp6_notify(struct sctp_inpcb *inp, /* Treat it like an ABORT. */ if (icmp6_code == ICMP6_PARAMPROB_NEXTHEADER) { sctp_abort_notification(stcb, 1, 0, NULL, SCTP_SO_NOT_LOCKED); -#if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) - so = SCTP_INP_SO(inp); - atomic_add_int(&stcb->asoc.refcnt, 1); - SCTP_TCB_UNLOCK(stcb); - SCTP_SOCKET_LOCK(so, 1); - SCTP_TCB_LOCK(stcb); - atomic_subtract_int(&stcb->asoc.refcnt, 1); -#endif (void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC, SCTP_FROM_SCTP_USRREQ + SCTP_LOC_2); -#if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING) - SCTP_SOCKET_UNLOCK(so, 1); -#endif } else { SCTP_TCB_UNLOCK(stcb); } |