From 9bf40ede4a299f315bc4b0ae5329631b8c7dc271 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Fri, 31 Oct 2003 18:32:15 +0000 Subject: 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) --- sys/dev/usb/if_aue.c | 3 +-- sys/dev/usb/if_axe.c | 3 +-- sys/dev/usb/if_cue.c | 3 +-- sys/dev/usb/if_kue.c | 3 +-- sys/dev/usb/if_rue.c | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) (limited to 'sys/dev/usb') diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index b584b6f9e342b..bbb566951f071 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -739,8 +739,7 @@ USB_ATTACH(aue) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_unit = sc->aue_unit; - ifp->if_name = "aue"; + if_initname(ifp, "aue", sc->aue_unit); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = aue_ioctl; diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c index a8087545f37dd..b4df6e675a35d 100644 --- a/sys/dev/usb/if_axe.c +++ b/sys/dev/usb/if_axe.c @@ -509,8 +509,7 @@ USB_ATTACH(axe) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_unit = sc->axe_unit; - ifp->if_name = "axe"; + if_initname(ifp, "axe", sc->axe_unit); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = axe_ioctl; diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 9497aabde9513..54d887ec5043e 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -520,8 +520,7 @@ USB_ATTACH(cue) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_unit = sc->cue_unit; - ifp->if_name = "cue"; + if_initname(ifp, "cue", sc->cue_unit); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = cue_ioctl; diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 28140d82922d4..2be9b5066316f 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -489,8 +489,7 @@ USB_ATTACH(kue) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_unit = sc->kue_unit; - ifp->if_name = "kue"; + if_initname(ifp, "kue", sc->kue_unit); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = kue_ioctl; diff --git a/sys/dev/usb/if_rue.c b/sys/dev/usb/if_rue.c index 53b3b77e5fffa..b23184c1eb67c 100644 --- a/sys/dev/usb/if_rue.c +++ b/sys/dev/usb/if_rue.c @@ -661,8 +661,7 @@ USB_ATTACH(rue) ifp = &sc->arpcom.ac_if; ifp->if_softc = sc; - ifp->if_unit = sc->rue_unit; - ifp->if_name = "rue"; + if_initname(ifp, "rue", sc->rue_unit); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = rue_ioctl; -- cgit v1.3