From owner-cvs-all@FreeBSD.ORG  Thu Jun  8 23:30:57 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DB0C316A41B;
	Thu,  8 Jun 2006 23:30:57 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BF5C643D7D;
	Thu,  8 Jun 2006 23:30:54 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k58NStbY086533;
	Thu, 8 Jun 2006 23:28:55 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k58NStJq086532;
	Thu, 8 Jun 2006 23:28:55 GMT (envelope-from rwatson)
Message-Id: <200606082328.k58NStJq086532@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 8 Jun 2006 23:28:55 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/netipx spx_usrreq.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jun 2006 23:30:58 -0000

rwatson     2006-06-08 23:28:55 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/netipx           spx_usrreq.c 
  Log:
  Merge spx_usrreq.c:1.75 from HEAD to RELENG_6:
  
    Restructure spx_attach() to properly free memory in the event that one
    of its allocations fails.  Allocate the ipxp last so as to avoid having
    to free it if another allocation goes wrong.
  
    Normalize retrieval of ipxp and cb from socket in spx_sp_attach(), and
    add assertions.
  
  Revision   Changes    Path
  1.62.2.11  +32 -21    src/sys/netipx/spx_usrreq.c