Module Name: src
Committed By: jdolecek
Date: Wed Jul 4 19:26:09 UTC 2018
Modified Files:
src/sys/dev/pci: if_msk.c if_sk.c
Log Message:
use pci_intr_establish_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/pci/if_sk.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_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.70 src/sys/dev/pci/if_msk.c:1.71
--- src/sys/dev/pci/if_msk.c:1.70 Tue Jul 3 19:56:01 2018
+++ src/sys/dev/pci/if_msk.c Wed Jul 4 19:26:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.70 2018/07/03 19:56:01 jdolecek Exp $ */
+/* $NetBSD: if_msk.c,v 1.71 2018/07/04 19:26:09 jdolecek Exp $ */
/* $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.70 2018/07/03 19:56:01 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.71 2018/07/04 19:26:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1375,7 +1375,8 @@ mskc_attach(device_t parent, device_t se
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sk_intrhand = pci_intr_establish(pc, ih, IPL_NET, msk_intr, sc);
+ sc->sk_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, msk_intr,
+ sc, device_xname(sc->sk_dev));
if (sc->sk_intrhand == NULL) {
aprint_error(": couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.88 src/sys/dev/pci/if_sk.c:1.89
--- src/sys/dev/pci/if_sk.c:1.88 Tue Jul 3 18:07:36 2018
+++ src/sys/dev/pci/if_sk.c Wed Jul 4 19:26:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.88 2018/07/03 18:07:36 jdolecek Exp $ */
+/* $NetBSD: if_sk.c,v 1.89 2018/07/04 19:26:09 jdolecek Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.88 2018/07/03 18:07:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.89 2018/07/04 19:26:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1631,7 +1631,8 @@ skc_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sk_intrhand = pci_intr_establish(pc, ih, IPL_NET, sk_intr, sc);
+ sc->sk_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, sk_intr, sc,
+ device_xname(sc->sk_dev));
if (sc->sk_intrhand == NULL) {
aprint_error(": couldn't establish interrupt");
if (intrstr != NULL)
