diff options
| author | brooks <brooks@FreeBSD.org> | 2003-10-31 18:32:15 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2003-10-31 18:32:15 +0000 |
| commit | f1e94c6f29b079e4ad9d9305ef3e90a719bcbbda (patch) | |
| tree | 4d9e6671d486576767506230a4240131526fea49 /sys/dev/sbni | |
| parent | be546fdee455a96afdefee10d0bdba8547399f5b (diff) | |
| download | FreeBSD-src-f1e94c6f29b079e4ad9d9305ef3e90a719bcbbda.zip FreeBSD-src-f1e94c6f29b079e4ad9d9305ef3e90a719bcbbda.tar.gz | |
Replace the if_name and if_unit members of struct ifnet with new members
if_xname, if_dname, and if_dunit. if_xname is the name of the interface
and if_dname/unit are the driver name and instance.
This change paves the way for interface renaming and enhanced pseudo
device creation and configuration symantics.
Approved By: re (in principle)
Reviewed By: njl, imp
Tested On: i386, amd64, sparc64
Obtained From: NetBSD (if_xname)
Diffstat (limited to 'sys/dev/sbni')
| -rw-r--r-- | sys/dev/sbni/if_sbni.c | 5 | ||||
| -rw-r--r-- | sys/dev/sbni/if_sbni_isa.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c index 1697a41..dad1dce 100644 --- a/sys/dev/sbni/if_sbni.c +++ b/sys/dev/sbni/if_sbni.c @@ -228,8 +228,7 @@ sbni_attach(struct sbni_softc *sc, int unit, struct sbni_flags flags) callout_handle_init(&sc->wch); /* Initialize ifnet structure */ ifp->if_softc = sc; - ifp->if_unit = unit; - ifp->if_name = "sbni"; + if_initname(ifp, "sbni", unit); ifp->if_init = sbni_init; ifp->if_start = sbni_start; ifp->if_output = ether_output; @@ -926,7 +925,7 @@ card_start(struct sbni_softc *sc) static void sbni_watchdog(struct ifnet *ifp) { - log(LOG_ERR, "sbni%d: device timeout\n", ifp->if_unit); + log(LOG_ERR, "%s: device timeout\n", ifp->if_xname); ifp->if_oerrors++; } diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c index 6da8b32..cb7b02c 100644 --- a/sys/dev/sbni/if_sbni_isa.c +++ b/sys/dev/sbni/if_sbni_isa.c @@ -156,8 +156,8 @@ sbni_attach_isa(device_t dev) dev, SYS_RES_IOPORT, sc->io_rid, sc->io_res); return (ENXIO); } else { - printf(" shared irq with sbni%d\n", - master->arpcom.ac_if.if_unit); + printf(" shared irq with %s\n", + master->arpcom.ac_if.if_xname); } } #endif /* SBNI_DUAL_COMPOUND */ |
