Module Name: src
Committed By: jdolecek
Date: Sun Dec 9 10:38:54 UTC 2018
Modified Files:
src/sys/dev/pci: if_ath_pci.c
Log Message:
put back the intr establish to ath_pci_resume() to avoid possibility of
functionality change, but add XXX comment that it shouldn't be necessary
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/if_ath_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ath_pci.c
diff -u src/sys/dev/pci/if_ath_pci.c:1.49 src/sys/dev/pci/if_ath_pci.c:1.50
--- src/sys/dev/pci/if_ath_pci.c:1.49 Sun Dec 9 10:06:56 2018
+++ src/sys/dev/pci/if_ath_pci.c Sun Dec 9 10:38:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.49 2018/12/09 10:06:56 jdolecek Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.50 2018/12/09 10:38:53 jdolecek Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.49 2018/12/09 10:06:56 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.50 2018/12/09 10:38:53 jdolecek Exp $");
/*
* PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
@@ -137,6 +137,13 @@ ath_pci_resume(device_t self, const pmf_
{
struct ath_pci_softc *sc = device_private(self);
+ /* XXX re-establishing interrupt shouldn't be needed */
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, sc->sc_pih, IPL_NET,
+ ath_intr, &sc->sc_sc, device_xname(self));
+ if (sc->sc_ih == NULL) {
+ aprint_error_dev(self, "couldn't map interrupt\n");
+ return false;
+ }
return ath_resume(&sc->sc_sc);
}
