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/en | |
| 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/en')
| -rw-r--r-- | sys/dev/en/if_en_pci.c | 7 | ||||
| -rw-r--r-- | sys/dev/en/midway.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c index b535d58..dac053e 100644 --- a/sys/dev/en/if_en_pci.c +++ b/sys/dev/en/if_en_pci.c @@ -193,14 +193,13 @@ en_pci_attach(device_t dev) struct en_softc *sc; struct en_pci_softc *scp; u_long val; - int rid, unit, error = 0; + int rid, error = 0; sc = device_get_softc(dev); scp = (struct en_pci_softc *)sc; - unit = device_get_unit(dev); - sc->ifatm.ifnet.if_unit = unit; - sc->ifatm.ifnet.if_name = "en"; + if_initname(&(sc->ifatm.ifnet), device_get_name(dev), + device_get_unit(dev)); /* * Enable bus mastering. diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c index bfb503d..48df206 100644 --- a/sys/dev/en/midway.c +++ b/sys/dev/en/midway.c @@ -1827,9 +1827,8 @@ en_rx_drain(struct en_softc *sc, u_int drq) m = NULL; /* assume "JK" trash DMA */ if (EN_DQ_LEN(drq) != 0) { _IF_DEQUEUE(&slot->indma, m); - KASSERT(m != NULL, ("drqsync: %s%d: lost mbuf in slot %zu!", - sc->ifatm.ifnet.if_name, sc->ifatm.ifnet.if_unit, - slot - sc->rxslot)); + KASSERT(m != NULL, ("drqsync: %s: lost mbuf in slot %zu!", + sc->ifatm.ifnet.if_xname, slot - sc->rxslot)); uma_zfree(sc->map_zone, (struct en_map *)m->m_pkthdr.rcvif); } if ((vc = slot->vcc) == NULL) { |
