sync with OpenBSD -current

This commit is contained in:
purplerain 2024-09-01 00:32:31 +00:00
parent 9419b92700
commit b62220995a
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
133 changed files with 2000 additions and 5128 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: if_alc.c,v 1.58 2024/05/24 06:02:53 jsg Exp $ */
/* $OpenBSD: if_alc.c,v 1.59 2024/08/31 16:23:09 deraadt Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@ -1465,23 +1465,18 @@ alc_activate(struct device *self, int act)
{
struct alc_softc *sc = (struct alc_softc *)self;
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
int rv = 0;
switch (act) {
case DVACT_SUSPEND:
if (ifp->if_flags & IFF_RUNNING)
alc_stop(sc);
rv = config_activate_children(self, act);
break;
case DVACT_RESUME:
if (ifp->if_flags & IFF_UP)
alc_init(ifp);
break;
default:
rv = config_activate_children(self, act);
break;
}
return (rv);
return (0);
}
int