Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Jan 2010 22:01:04 +0000 (UTC)
From:      Gavin Atkinson <gavin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r202950 - stable/8/sys/dev/ae
Message-ID:  <201001242201.o0OM14Su055310@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001242201.o0OM14Su055310>