From 70ab0ed557e2bfba1ee7f7e04ef56422a59c1d78 Mon Sep 17 00:00:00 2001 From: tuexen Date: Sun, 17 Jan 2016 12:15:41 +0000 Subject: MFC r291904: Fix the allocation of outgoing streams: * When processing a cookie, use the number of streams announced in the INIT-ACK. * When sending an INIT-ACK for an existing association, use the value from the association, not from the end-point. --- sys/netinet/sctp_pcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sys/netinet/sctp_pcb.h') diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index f5ede2a..ff6ccc5 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -584,7 +584,7 @@ void sctp_inpcb_free(struct sctp_inpcb *, int, int); struct sctp_tcb * sctp_aloc_assoc(struct sctp_inpcb *, struct sockaddr *, - int *, uint32_t, uint32_t, struct thread *); + int *, uint32_t, uint32_t, uint16_t, struct thread *); int sctp_free_assoc(struct sctp_inpcb *, struct sctp_tcb *, int, int); -- cgit v1.1 From 2c9e1a88dc9d311bcede80648189f2024c1dc4f1 Mon Sep 17 00:00:00 2001 From: tuexen Date: Sun, 17 Jan 2016 12:18:01 +0000 Subject: MFC r292060: Retire sctp_validate_no_locks(). This routine checks that there are no locks held for an inp, without having any lock on the inp. This breaks if the inp goes away when it is called. This happens on stress tests on a RPi B+. --- sys/netinet/sctp_pcb.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sys/netinet/sctp_pcb.h') diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index ff6ccc5..165ef3b 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -654,11 +654,5 @@ void #endif -#ifdef INVARIANTS -void - sctp_validate_no_locks(struct sctp_inpcb *inp); - -#endif - #endif /* _KERNEL */ #endif /* !__sctp_pcb_h__ */ -- cgit v1.1