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/iicbus/if_ic.c | |
| 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/iicbus/if_ic.c')
| -rw-r--r-- | sys/dev/iicbus/if_ic.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c index d09973a..a98720f 100644 --- a/sys/dev/iicbus/if_ic.c +++ b/sys/dev/iicbus/if_ic.c @@ -134,8 +134,7 @@ icattach(device_t dev) sc->ic_addr = PCF_MASTER_ADDRESS; /* XXX only PCF masters */ ifp->if_softc = sc; - ifp->if_name = "ic"; - ifp->if_unit = device_get_unit(dev); + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ICMTU; ifp->if_flags = IFF_SIMPLEX | IFF_POINTOPOINT | IFF_MULTICAST; ifp->if_ioctl = icioctl; @@ -158,7 +157,7 @@ icattach(device_t dev) static int icioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { - device_t icdev = devclass_get_device(ic_devclass, ifp->if_unit); + device_t icdev = devclass_get_device(ic_devclass, ifp->if_dunit); device_t parent = device_get_parent(icdev); struct ic_softc *sc = (struct ic_softc *)device_get_softc(icdev); @@ -363,7 +362,7 @@ static int icoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt) { - device_t icdev = devclass_get_device(ic_devclass, ifp->if_unit); + device_t icdev = devclass_get_device(ic_devclass, ifp->if_dunit); device_t parent = device_get_parent(icdev); struct ic_softc *sc = (struct ic_softc *)device_get_softc(icdev); |
