svn commit: r202950 - stable/8/sys/dev/ae

Gavin Atkinson gavin at FreeBSD.org
Sun Jan 24 22:01:04 UTC 2010


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;


More information about the svn-src-stable mailing list