From owner-svn-src-stable@FreeBSD.ORG Sun Jan 24 22:01:04 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 7D676106566C;
Sun, 24 Jan 2010 22:01:04 +0000 (UTC)
(envelope-from gavin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 6B7638FC15;
Sun, 24 Jan 2010 22:01:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0OM14QB055312;
Sun, 24 Jan 2010 22:01:04 GMT (envelope-from gavin@svn.freebsd.org)
Received: (from gavin@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0OM14Su055310;
Sun, 24 Jan 2010 22:01:04 GMT (envelope-from gavin@svn.freebsd.org)
Message-Id: <201001242201.o0OM14Su055310@svn.freebsd.org>
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Sun, 24 Jan 2010 22:01:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r202950 - stable/8/sys/dev/ae
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Jan 2010 22:01:04 -0000
Author: gavin
Date: Sun Jan 24 22:01:04 2010
New Revision: 202950
URL: http://svn.freebsd.org/changeset/base/202950
Log:
Merge r202000 from head:
Don't panic on attach if we can't allocate ifp
Approved by: ed (mentor, implicit)
Modified:
stable/8/sys/dev/ae/if_ae.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/ae/if_ae.c
==============================================================================
--- stable/8/sys/dev/ae/if_ae.c Sun Jan 24 21:17:06 2010 (r202949)
+++ stable/8/sys/dev/ae/if_ae.c Sun Jan 24 22:01:04 2010 (r202950)
@@ -367,6 +367,7 @@ ae_attach(device_t dev)
if (ifp == NULL) {
device_printf(dev, "could not allocate ifnet structure.\n");
error = ENXIO;
+ goto fail;
}
ifp->if_softc = sc;