svn commit: r294206 - stable/10/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sun Jan 17 11:59:42 2016
New Revision: 294206
URL: https://svnweb.freebsd.org/changeset/base/294206

Log:
  MFC r291376:
  When the sending of an SCTP outgoing stream reset request fails,
  don't report it to the user since all stream have been marked
  as pending.

Modified:
  stable/10/sys/netinet/sctp_usrreq.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet/sctp_usrreq.c
==============================================================================
--- stable/10/sys/netinet/sctp_usrreq.c	Sun Jan 17 08:40:51 2016	(r294205)
+++ stable/10/sys/netinet/sctp_usrreq.c	Sun Jan 17 11:59:42 2016	(r294206)
@@ -4651,11 +4651,20 @@ sctp_setopt(struct socket *so, int optna
 				error = sctp_send_str_reset_req(stcb, strrst->srs_number_streams,
 				    strrst->srs_stream_list,
 				    send_in, 0, 0, 0, 0, 0);
-			} else
+			} else {
 				error = sctp_send_stream_reset_out_if_possible(stcb, SCTP_SO_LOCKED);
-			if (!error)
+			}
+			if (error == 0) {
 				sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_STRRST_REQ, SCTP_SO_LOCKED);
-
+			} else {
+				/*
+				 * For outgoing streams don't report any
+				 * problems in sending the request to the
+				 * application. XXX: Double check resetting
+				 * incoming streams.
+				 */
+				error = 0;
+			}
 			SCTP_TCB_UNLOCK(stcb);
 			break;
 		}