Backout last two revision:

1.) There is objection against this change by at least one developer.
2.) These changes cause repeatable system lockups and crashes for
    at least four people.
This commit is contained in:
tron 2004-10-07 20:06:58 +00:00
parent f747989e34
commit 8982fe0346
1 changed files with 6 additions and 13 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: if.c,v 1.146 2004/10/06 03:49:03 itojun Exp $ */
/* $NetBSD: if.c,v 1.147 2004/10/07 20:06:58 tron Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.146 2004/10/06 03:49:03 itojun Exp $");
__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.147 2004/10/07 20:06:58 tron Exp $");
#include "opt_inet.h"
@ -479,6 +479,9 @@ if_attach(ifp)
(struct mbuf **)PFIL_IFNET_ATTACH, ifp, PFIL_IFNET);
#endif
if (domains)
if_attachdomain1(ifp);
/* Announce the interface. */
rt_ifannouncemsg(ifp, IFAN_ARRIVAL);
}
@ -771,8 +774,6 @@ if_clone_create(name)
{
struct if_clone *ifc;
int unit;
int error;
int s;
ifc = if_clone_lookup(name, &unit);
if (ifc == NULL)
@ -781,15 +782,7 @@ if_clone_create(name)
if (ifunit(name) != NULL)
return (EEXIST);
error = (*ifc->ifc_create)(ifc, unit);
if (error)
return (error);
s = splnet();
if_attachdomain1(ifunit(name));
splx(s);
return (error);
return ((*ifc->ifc_create)(ifc, unit));
}
/*