summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authortuexen <tuexen@FreeBSD.org>2016-01-16 18:18:47 +0000
committertuexen <tuexen@FreeBSD.org>2016-01-16 18:18:47 +0000
commit2c71b0cb5af8629f8475e0296321fdf9e26c9d33 (patch)
tree9c88ff04b640ebfbc5447b06cdd1e563576989f0 /sys/netinet
parent4c424eca5670f6df1b25f12be2a48b560b503789 (diff)
downloadFreeBSD-src-2c71b0cb5af8629f8475e0296321fdf9e26c9d33.zip
FreeBSD-src-2c71b0cb5af8629f8475e0296321fdf9e26c9d33.tar.gz
MFC r291140:
Revert part of r291137 which seems correct, bit does not fix the resource problem I'm currently hunting down.
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/sctp_pcb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index ab27a7e..0d28453 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -3644,11 +3644,13 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from)
* 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;
OpenPOWER on IntegriCloud