From owner-svn-src-head@FreeBSD.ORG  Sat Dec 20 13:47:40 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 33744B09;
 Sat, 20 Dec 2014 13:47:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1F44E2790;
 Sat, 20 Dec 2014 13:47:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBKDldbA027660;
 Sat, 20 Dec 2014 13:47:39 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBKDldGN027659;
 Sat, 20 Dec 2014 13:47:39 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201412201347.sBKDldGN027659@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: tuexen set sender to
 tuexen@FreeBSD.org using -f
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sat, 20 Dec 2014 13:47:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275954 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Dec 2014 13:47:40 -0000

Author: tuexen
Date: Sat Dec 20 13:47:38 2014
New Revision: 275954
URL: https://svnweb.freebsd.org/changeset/base/275954

Log:
  Cleanup the code.
  
  Reported by:	Coverity
  CID:		1232003

Modified:
  head/sys/netinet/sctp_usrreq.c

Modified: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c	Sat Dec 20 13:33:31 2014	(r275953)
+++ head/sys/netinet/sctp_usrreq.c	Sat Dec 20 13:47:38 2014	(r275954)
@@ -3643,12 +3643,6 @@ flags_out:
 			    (sid < stcb->asoc.streamoutcnt) &&
 			    ((policy == SCTP_PR_SCTP_ALL) ||
 			    (PR_SCTP_VALID_POLICY(policy)))) {
-#else
-			if ((stcb != NULL) &&
-			    (policy != SCTP_PR_SCTP_NONE) &&
-			    (sid < stcb->asoc.streamoutcnt) &&
-			    (policy == SCTP_PR_SCTP_ALL)) {
-#endif
 				if (policy == SCTP_PR_SCTP_ALL) {
 					sprstat->sprstat_abandoned_unsent = stcb->asoc.strmout[sid].abandoned_unsent[0];
 					sprstat->sprstat_abandoned_sent = stcb->asoc.strmout[sid].abandoned_sent[0];
@@ -3656,6 +3650,13 @@ flags_out:
 					sprstat->sprstat_abandoned_unsent = stcb->asoc.strmout[sid].abandoned_unsent[policy];
 					sprstat->sprstat_abandoned_sent = stcb->asoc.strmout[sid].abandoned_sent[policy];
 				}
+#else
+			if ((stcb != NULL) &&
+			    (policy == SCTP_PR_SCTP_ALL) &&
+			    (sid < stcb->asoc.streamoutcnt)) {
+				sprstat->sprstat_abandoned_unsent = stcb->asoc.strmout[sid].abandoned_unsent[0];
+				sprstat->sprstat_abandoned_sent = stcb->asoc.strmout[sid].abandoned_sent[0];
+#endif
 				SCTP_TCB_UNLOCK(stcb);
 				*optsize = sizeof(struct sctp_prstatus);
 			} else {