From owner-svn-src-projects@freebsd.org  Sat Jan 23 12:50:04 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 23053A8C14B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat, 23 Jan 2016 12:50:04 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 E128010AA;
 Sat, 23 Jan 2016 12:50:03 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NCo26p002253;
 Sat, 23 Jan 2016 12:50:02 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NCo2sY002252;
 Sat, 23 Jan 2016 12:50:02 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201601231250.u0NCo2sY002252@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 23 Jan 2016 12:50:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r294628 - projects/vnet/sys/netinet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jan 2016 12:50:04 -0000

Author: bz
Date: Sat Jan 23 12:50:02 2016
New Revision: 294628
URL: https://svnweb.freebsd.org/changeset/base/294628

Log:
  Use sctp_asconf_iterator_end() rather than doing the cleanup manually.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/vnet/sys/netinet/sctp_asconf.c

Modified: projects/vnet/sys/netinet/sctp_asconf.c
==============================================================================
--- projects/vnet/sys/netinet/sctp_asconf.c	Sat Jan 23 12:25:24 2016	(r294627)
+++ projects/vnet/sys/netinet/sctp_asconf.c	Sat Jan 23 12:50:02 2016	(r294628)
@@ -3281,10 +3281,7 @@ sctp_addr_mgmt_ep_sa(struct sctp_inpcb *
 			if (ret)  {
 				SCTP_PRINTF("Failed to initiate iterator for addr_mgmt_ep_sa\n");
 				SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_ASCONF, EFAULT);
-				atomic_add_int(&ifa->refcount, -1);
-				SCTP_DECR_LADDR_COUNT();
-				SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_laddr), wi);	
-				SCTP_FREE(asc, SCTP_M_ASC_IT);
+				sctp_asconf_iterator_end(asc);
 				return (EFAULT);
 			}
 		}