Module Name: src
Committed By: cegger
Date: Mon May 11 21:31:29 UTC 2009
Modified Files:
src/sys/compat/ndis: kern_ndis.c subr_ndis.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/ndis/kern_ndis.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/ndis/subr_ndis.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/compat/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.20 src/sys/compat/ndis/kern_ndis.c:1.21
--- src/sys/compat/ndis/kern_ndis.c:1.20 Wed May 6 22:38:31 2009
+++ src/sys/compat/ndis/kern_ndis.c Mon May 11 21:31:29 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.20 2009/05/06 22:38:31 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.21 2009/05/11 21:31:29 cegger Exp $");
#endif
#include <sys/param.h>
@@ -938,7 +938,7 @@
#endif
if (ifp->if_flags & IFF_DEBUG)
printf("%s: status: %x\n",
- sc->ndis_dev->dv_xname, status);
+ device_xname(sc->ndis_dev), status);
return;
}
@@ -963,7 +963,7 @@
#endif
if (ifp->if_flags & IFF_DEBUG)
printf("%s: status complete\n",
- sc->ndis_dev->dv_xname);
+ device_xname(sc->ndis_dev));
return;
}
@@ -1012,7 +1012,7 @@
if (ifp->if_flags & IFF_DEBUG)
printf("%s: reset done...\n",
- sc->ndis_dev->dv_xname);
+ device_xname(sc->ndis_dev));
wakeup(sc);
return;
}
@@ -1145,7 +1145,7 @@
/* Create the sysctl tree. */
sysctl_createv(&sc->sysctllog, 0, NULL, &ndis_node, CTLFLAG_READWRITE, CTLTYPE_NODE,
- sc->ndis_dev->dv_xname, NULL, NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
+ device_xname(sc->ndis_dev), NULL, NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
/* Store the number of the ndis mib */
sc->ndis_sysctl_mib = ndis_node->sysctl_num;
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.19 src/sys/compat/ndis/subr_ndis.c:1.20
--- src/sys/compat/ndis/subr_ndis.c:1.19 Wed Mar 18 17:06:48 2009
+++ src/sys/compat/ndis/subr_ndis.c Mon May 11 21:31:29 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.19 2009/03/18 17:06:48 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.20 2009/05/11 21:31:29 cegger Exp $");
#endif
/*
@@ -1204,9 +1204,9 @@
str = ustr;
}
- printf ("%s: NDIS ERROR: %x (%s)\n", dev->dv_xname, code,
+ printf ("%s: NDIS ERROR: %x (%s)\n", device_xname(dev), code,
str == NULL ? "unknown error" : str);
- printf ("%s: NDIS NUMERRORS: %x\n", dev->dv_xname, numerrors);
+ printf ("%s: NDIS NUMERRORS: %x\n", device_xname(dev), numerrors);
va_start(ap, numerrors);
for (i = 0; i < numerrors; i++)
