Module Name: src
Committed By: mbalmer
Date: Sat Oct 8 10:21:16 UTC 2011
Modified Files:
src/sys/dev/pci: if_iwn.c
Log Message:
Make this compile again: Use the device_xname() macro to get the devic name.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/if_iwn.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_iwn.c
diff -u src/sys/dev/pci/if_iwn.c:1.59 src/sys/dev/pci/if_iwn.c:1.60
--- src/sys/dev/pci/if_iwn.c:1.59 Fri Oct 7 22:42:18 2011
+++ src/sys/dev/pci/if_iwn.c Sat Oct 8 10:21:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.59 2011/10/07 22:42:18 elric Exp $ */
+/* $NetBSD: if_iwn.c,v 1.60 2011/10/08 10:21:16 mbalmer Exp $ */
/* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.59 2011/10/07 22:42:18 elric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.60 2011/10/08 10:21:16 mbalmer Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -4098,7 +4098,7 @@ iwn_set_pslevel(struct iwn_softc *sc, in
return iwn_cmd(sc, IWN_CMD_SET_POWER_MODE, &cmd, sizeof cmd, async);
}
- int
+int
iwn5000_runtime_calib(struct iwn_softc *sc)
{
struct iwn5000_calib_config cmd;
@@ -4127,7 +4127,7 @@ iwn_config(struct iwn_softc *sc)
error = iwn5000_runtime_calib(sc);
if (error != 0) {
printf("%s: could not configure runtime calibration\n",
- sc->sc_dev.dv_xname);
+ device_xname(sc->sc_dev));
return error;
}
}
