- Locking compatiability changes. This involves adding

  additional flags to many function calls. The flags only
  get used in BSD when we compile with lock testing. These
  flags allow apple to escape the "giant" lock it holds on
  the socket and have more fine-grained locking in the NKE.
  It also allows us to test (with witness) the locking used
  by apple via a compile switch (manually applied).

Approved by:	re@freebsd.org(B Mah)

1 files changed, 18 insertions, 3 deletions

diff --git a/sys/netinet/sctp_output.h b/sys/netinet/sctp_output.h
index 0643e94..bd35269 100644
--- a/sys/netinet/sctp_output.h
+++ b/sys/netinet/sctp_output.h
@@ -74,7 +74,12 @@ int
 int
     sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_route_t * ro);
 
-void sctp_send_initiate(struct sctp_inpcb *, struct sctp_tcb *);
+void 
+sctp_send_initiate(struct sctp_inpcb *, struct sctp_tcb *, int
+#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
+    SCTP_UNUSED
+#endif
+);
 
 void
 sctp_send_initiate_ack(struct sctp_inpcb *, struct sctp_tcb *,
@@ -128,8 +133,18 @@ sctp_insert_on_wheel(struct sctp_tcb *stcb,
     struct sctp_association *asoc,
     struct sctp_stream_out *strq, int holdslock);
 
-void sctp_chunk_output(struct sctp_inpcb *, struct sctp_tcb *, int);
-void sctp_send_abort_tcb(struct sctp_tcb *, struct mbuf *);
+void 
+sctp_chunk_output(struct sctp_inpcb *, struct sctp_tcb *, int, int
+#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
+    SCTP_UNUSED
+#endif
+);
+void 
+sctp_send_abort_tcb(struct sctp_tcb *, struct mbuf *, int
+#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
+    SCTP_UNUSED
+#endif
+);
 
 void send_forward_tsn(struct sctp_tcb *, struct sctp_association *);