Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci put back the intr establish to ath_pci_resume() ...



details:   https://anonhg.NetBSD.org/src/rev/3c2c8abd21e3
branches:  trunk
changeset: 995137:3c2c8abd21e3
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Dec 09 10:38:53 2018 +0000

description:
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

diffstat:

 sys/dev/pci/if_ath_pci.c |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r b4a3b6e4cdd6 -r 3c2c8abd21e3 sys/dev/pci/if_ath_pci.c
--- a/sys/dev/pci/if_ath_pci.c  Sun Dec 09 10:06:56 2018 +0000
+++ b/sys/dev/pci/if_ath_pci.c  Sun Dec 09 10:38:53 2018 +0000
@@ -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 @@
 {
        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);
 }
 



Home | Main Index | Thread Index | Old Index