svn commit: r291140 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat Nov 21 16:46:59 2015
New Revision: 291140
URL: https://svnweb.freebsd.org/changeset/base/291140

Log:
  Revert part of r291137 which seems correct, bit does not fix the
  resource problem I'm currently hunting down.
  
  MFC after:	1 week
  X-MFC with:	291137

Modified:
  head/sys/netinet/sctp_pcb.c

Modified: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c	Sat Nov 21 16:37:11 2015	(r291139)
+++ head/sys/netinet/sctp_pcb.c	Sat Nov 21 16:46:59 2015	(r291140)
@@ -3640,11 +3640,13 @@ sctp_inpcb_free(struct sctp_inpcb *inp, 
 	 * macro here since le_next will get freed as part of the
 	 * sctp_free_assoc() call.
 	 */
+	if (so) {
 #ifdef IPSEC
-	if (ip_pcb->inp_sp != NULL) {
 		ipsec_delete_pcbpolicy(ip_pcb);
+#endif				/* IPSEC */
+
+		/* Unlocks not needed since the socket is gone now */
 	}
-#endif
 	if (ip_pcb->inp_options) {
 		(void)sctp_m_free(ip_pcb->inp_options);
 		ip_pcb->inp_options = 0;