on resume: calling sc_power after ath_init() is silly. ath_init()
authorderaadt <deraadt@openbsd.org>
Wed, 4 Aug 2010 21:02:24 +0000 (21:02 +0000)
committerderaadt <deraadt@openbsd.org>
Wed, 4 Aug 2010 21:02:24 +0000 (21:02 +0000)
gets down to there through ath_init() -> ath_enable() -> ...
from a discussion with damien

sys/dev/ic/ath.c

index 41b5455..c25a9f4 100644 (file)
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.86 2010/07/02 06:06:30 reyk Exp $  */
+/*      $OpenBSD: ath.c,v 1.87 2010/08/04 21:02:24 deraadt Exp $  */
 /*     $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $  */
 
 /*-
@@ -529,8 +529,6 @@ ath_resume(struct ath_softc *sc, int why)
 
        if (ifp->if_flags & IFF_UP) {
                ath_init(ifp);
-               if (sc->sc_power != NULL)
-                       (*sc->sc_power)(sc, why);
                if (ifp->if_flags & IFF_RUNNING)
                        ath_start(ifp);
        }