From 4372b8e4f16e3453658ea326d671b07acec500aa Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Sat, 10 Jul 2004 12:48:55 +0000 Subject: [PATCH] Stop using if_dname, use if_printf or ifp->if_xname instead. --- sys/dev/netif/awi/awi.c | 6 +++--- sys/dev/netif/awi/awivar.h | 9 +-------- sys/dev/netif/awi/if_awi_pccard.c | 12 ++---------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/sys/dev/netif/awi/awi.c b/sys/dev/netif/awi/awi.c index 44ebf72d0e..eabf213ece 100644 --- a/sys/dev/netif/awi/awi.c +++ b/sys/dev/netif/awi/awi.c @@ -1,6 +1,6 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awi.c,v 1.10.2.2 2003/01/23 21:06:42 sam Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.14 2004/07/02 17:42:16 joerg Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.15 2004/07/10 12:48:55 joerg Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -1191,8 +1191,8 @@ awi_input(sc, m, rxts, rssi) wh = mtod(m, struct ieee80211_frame *); if ((wh->i_fc[0] & IEEE80211_FC0_VERSION_MASK) != IEEE80211_FC0_VERSION_0) { - printf("%s; receive packet with wrong version: %x\n", - sc->sc_dev.dv_xname, wh->i_fc[0]); + if_printf(ifp, "receive packet with wrong version: %x\n", + wh->i_fc[0]); m_freem(m); ifp->if_ierrors++; return; diff --git a/sys/dev/netif/awi/awivar.h b/sys/dev/netif/awi/awivar.h index 0058add15a..d7a941f41e 100644 --- a/sys/dev/netif/awi/awivar.h +++ b/sys/dev/netif/awi/awivar.h @@ -1,6 +1,6 @@ /* $NetBSD: awivar.h,v 1.12 2000/07/21 04:48:56 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.6.2.1 2000/12/07 04:09:39 imp Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awivar.h,v 1.4 2004/02/13 02:44:47 joerg Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awivar.h,v 1.5 2004/07/10 12:48:55 joerg Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -96,13 +96,6 @@ struct awi_softc void *sc_ih; /* interrupt handler */ #endif #if defined(__DragonFly__) || defined(__FreeBSD__) -#if defined(__DragonFly__) || __FreeBSD__ >= 4 - struct { - char dv_xname[64]; /*XXX*/ - } sc_dev; -#else - struct device sc_dev; -#endif struct arpcom sc_ec; #endif struct am79c930_softc sc_chip; diff --git a/sys/dev/netif/awi/if_awi_pccard.c b/sys/dev/netif/awi/if_awi_pccard.c index 115553da8c..f7ea8af90b 100644 --- a/sys/dev/netif/awi/if_awi_pccard.c +++ b/sys/dev/netif/awi/if_awi_pccard.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.5.2.1 2000/12/07 04:09:39 imp Exp $ - * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.8 2004/03/14 15:36:48 joerg Exp $ + * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.9 2004/07/10 12:48:55 joerg Exp $ */ #include @@ -147,15 +147,7 @@ awi_pccard_attach(device_t dev) psc->sc_mem_res = 0; psc->sc_intrhand = 0; - ifp->if_dname = device_get_name(dev); - if (ifp->if_dname == NULL) { - printf("awi%d: awi_pccard_attach: cannot get device name\n", - device_get_unit(dev)); - goto fail; - } - if_initname(ifp, ifp->if_dname, device_get_unit(dev)); - strlcpy(sc->sc_dev.dv_xname, ifp->if_xname, - sizeof(sc->sc_dev.dv_xname)); + if_initname(ifp, device_get_name(dev), device_get_unit(dev)); psc->sc_port_rid = 0; psc->sc_port_res = bus_alloc_resource(dev, SYS_RES_IOPORT, -- 2.41.0