From owner-p4-projects@FreeBSD.ORG  Fri Oct 31 12:09:08 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6E80716A4D0; Fri, 31 Oct 2003 12:09:08 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4218216A4CE
	for <perforce@freebsd.org>; Fri, 31 Oct 2003 12:09:08 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7D5443F93
	for <perforce@freebsd.org>; Fri, 31 Oct 2003 12:09:06 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9VK96XJ008715
	for <perforce@freebsd.org>; Fri, 31 Oct 2003 12:09:06 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9VK94Mu008712
	for perforce@freebsd.org; Fri, 31 Oct 2003 12:09:04 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Fri, 31 Oct 2003 12:09:04 -0800 (PST)
Message-Id: <200310312009.h9VK94Mu008712@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41006 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Oct 2003 20:09:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=41006

Change 41006 by sam@sam_ebb on 2003/10/31 12:08:38

	IFC @ 41005

Affected files ...

.. //depot/projects/netperf/sys/alpha/osf1/osf1_ioctl.c#3 integrate
.. //depot/projects/netperf/sys/compat/linux/linux_ioctl.c#4 integrate
.. //depot/projects/netperf/sys/conf/options.i386#3 integrate
.. //depot/projects/netperf/sys/conf/options.pc98#2 integrate
.. //depot/projects/netperf/sys/contrib/dev/oltr/if_oltr.c#4 integrate
.. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate
.. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate
.. //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate
.. //depot/projects/netperf/sys/dev/an/if_an.c#4 integrate
.. //depot/projects/netperf/sys/dev/ar/if_ar.c#3 integrate
.. //depot/projects/netperf/sys/dev/ath/if_ath.c#30 integrate
.. //depot/projects/netperf/sys/dev/awi/if_awi_pccard.c#3 integrate
.. //depot/projects/netperf/sys/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/netperf/sys/dev/bge/if_bge.c#11 integrate
.. //depot/projects/netperf/sys/dev/bge/if_bgereg.h#6 integrate
.. //depot/projects/netperf/sys/dev/cm/if_cm_isa.c#3 integrate
.. //depot/projects/netperf/sys/dev/cm/smc90cx6.c#4 integrate
.. //depot/projects/netperf/sys/dev/cm/smc90cx6var.h#2 integrate
.. //depot/projects/netperf/sys/dev/cnw/if_cnw.c#3 integrate
.. //depot/projects/netperf/sys/dev/cs/if_cs.c#4 integrate
.. //depot/projects/netperf/sys/dev/cs/if_cs_isa.c#3 integrate
.. //depot/projects/netperf/sys/dev/cs/if_cs_pccard.c#3 integrate
.. //depot/projects/netperf/sys/dev/cs/if_csvar.h#2 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed.c#5 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed_cbus.c#4 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed_isa.c#4 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed_pccard.c#5 integrate
.. //depot/projects/netperf/sys/dev/ed/if_ed_pci.c#5 integrate
.. //depot/projects/netperf/sys/dev/ed/if_edvar.h#3 integrate
.. //depot/projects/netperf/sys/dev/em/if_em.c#9 integrate
.. //depot/projects/netperf/sys/dev/en/if_en_pci.c#5 integrate
.. //depot/projects/netperf/sys/dev/en/midway.c#3 integrate
.. //depot/projects/netperf/sys/dev/ep/if_ep.c#8 integrate
.. //depot/projects/netperf/sys/dev/ex/if_ex.c#3 integrate
.. //depot/projects/netperf/sys/dev/fatm/if_fatm.c#7 integrate
.. //depot/projects/netperf/sys/dev/fe/if_fe.c#3 integrate
.. //depot/projects/netperf/sys/dev/fe/if_fevar.h#2 integrate
.. //depot/projects/netperf/sys/dev/firewire/firewirereg.h#4 integrate
.. //depot/projects/netperf/sys/dev/firewire/fwohci.c#7 integrate
.. //depot/projects/netperf/sys/dev/firewire/if_fwe.c#5 integrate
.. //depot/projects/netperf/sys/dev/firewire/sbp.c#9 integrate
.. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#11 integrate
.. //depot/projects/netperf/sys/dev/fxp/if_fxpvar.h#4 integrate
.. //depot/projects/netperf/sys/dev/gem/if_gem.c#3 integrate
.. //depot/projects/netperf/sys/dev/gx/if_gx.c#4 integrate
.. //depot/projects/netperf/sys/dev/harp/if_harp.c#3 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#9 integrate
.. //depot/projects/netperf/sys/dev/hatm/if_hatmvar.h#7 integrate
.. //depot/projects/netperf/sys/dev/hme/if_hme.c#3 integrate
.. //depot/projects/netperf/sys/dev/ie/if_ie.c#3 integrate
.. //depot/projects/netperf/sys/dev/iicbus/if_ic.c#3 integrate
.. //depot/projects/netperf/sys/dev/lge/if_lge.c#4 integrate
.. //depot/projects/netperf/sys/dev/lnc/if_lnc.c#3 integrate
.. //depot/projects/netperf/sys/dev/mii/brgphy.c#6 integrate
.. //depot/projects/netperf/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/netperf/sys/dev/nge/if_nge.c#4 integrate
.. //depot/projects/netperf/sys/dev/patm/if_patm_attach.c#5 integrate
.. //depot/projects/netperf/sys/dev/pdq/if_fea.c#3 integrate
.. //depot/projects/netperf/sys/dev/pdq/if_fpa.c#3 integrate
.. //depot/projects/netperf/sys/dev/pdq/pdq_freebsd.h#2 integrate
.. //depot/projects/netperf/sys/dev/pdq/pdqvar.h#2 integrate
.. //depot/projects/netperf/sys/dev/ppbus/if_plip.c#3 integrate
.. //depot/projects/netperf/sys/dev/ray/if_ray.c#3 integrate
.. //depot/projects/netperf/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/netperf/sys/dev/sbni/if_sbni.c#4 integrate
.. //depot/projects/netperf/sys/dev/sbni/if_sbni_isa.c#3 integrate
.. //depot/projects/netperf/sys/dev/sbsh/if_sbsh.c#5 integrate
.. //depot/projects/netperf/sys/dev/sn/if_sn.c#4 integrate
.. //depot/projects/netperf/sys/dev/sr/if_sr.c#3 integrate
.. //depot/projects/netperf/sys/dev/tx/if_tx.c#5 integrate
.. //depot/projects/netperf/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/netperf/sys/dev/usb/if_aue.c#5 integrate
.. //depot/projects/netperf/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/netperf/sys/dev/usb/if_cue.c#5 integrate
.. //depot/projects/netperf/sys/dev/usb/if_kue.c#4 integrate
.. //depot/projects/netperf/sys/dev/usb/if_rue.c#4 integrate
.. //depot/projects/netperf/sys/dev/vx/if_vx.c#4 integrate
.. //depot/projects/netperf/sys/dev/vx/if_vx_eisa.c#4 integrate
.. //depot/projects/netperf/sys/dev/vx/if_vx_pci.c#6 integrate
.. //depot/projects/netperf/sys/dev/vx/if_vxvar.h#2 integrate
.. //depot/projects/netperf/sys/dev/wi/if_wi.c#11 integrate
.. //depot/projects/netperf/sys/dev/wl/if_wl.c#3 integrate
.. //depot/projects/netperf/sys/dev/xe/if_xe.c#5 integrate
.. //depot/projects/netperf/sys/i386/i386/machdep.c#9 integrate
.. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#8 integrate
.. //depot/projects/netperf/sys/i386/i386/mpboot.s#3 integrate
.. //depot/projects/netperf/sys/i386/i386/pmap.c#21 integrate
.. //depot/projects/netperf/sys/i386/include/segments.h#3 integrate
.. //depot/projects/netperf/sys/i386/isa/cx.c#2 integrate
.. //depot/projects/netperf/sys/i386/isa/if_cx.c#2 integrate
.. //depot/projects/netperf/sys/i386/isa/if_el.c#2 integrate
.. //depot/projects/netperf/sys/i386/isa/if_le.c#2 integrate
.. //depot/projects/netperf/sys/i386/isa/if_rdp.c#4 integrate
.. //depot/projects/netperf/sys/i4b/driver/i4b_ipr.c#2 integrate
.. //depot/projects/netperf/sys/i4b/driver/i4b_isppp.c#2 integrate
.. //depot/projects/netperf/sys/kern/sched_ule.c#14 integrate
.. //depot/projects/netperf/sys/kern/subr_smp.c#3 integrate
.. //depot/projects/netperf/sys/net/bpf.c#8 integrate
.. //depot/projects/netperf/sys/net/bridge.c#13 integrate
.. //depot/projects/netperf/sys/net/if.c#11 integrate
.. //depot/projects/netperf/sys/net/if.h#3 integrate
.. //depot/projects/netperf/sys/net/if_arcsubr.c#4 integrate
.. //depot/projects/netperf/sys/net/if_atmsubr.c#3 integrate
.. //depot/projects/netperf/sys/net/if_disc.c#5 integrate
.. //depot/projects/netperf/sys/net/if_ef.c#4 integrate
.. //depot/projects/netperf/sys/net/if_ethersubr.c#10 integrate
.. //depot/projects/netperf/sys/net/if_faith.c#7 integrate
.. //depot/projects/netperf/sys/net/if_gif.c#2 integrate
.. //depot/projects/netperf/sys/net/if_gre.c#2 integrate
.. //depot/projects/netperf/sys/net/if_loop.c#12 integrate
.. //depot/projects/netperf/sys/net/if_media.c#2 integrate
.. //depot/projects/netperf/sys/net/if_mib.c#2 integrate
.. //depot/projects/netperf/sys/net/if_ppp.c#5 integrate
.. //depot/projects/netperf/sys/net/if_sl.c#2 integrate
.. //depot/projects/netperf/sys/net/if_spppsubr.c#3 integrate
.. //depot/projects/netperf/sys/net/if_stf.c#5 integrate
.. //depot/projects/netperf/sys/net/if_tap.c#2 integrate
.. //depot/projects/netperf/sys/net/if_tun.c#4 integrate
.. //depot/projects/netperf/sys/net/if_var.h#4 integrate
.. //depot/projects/netperf/sys/net/if_vlan.c#6 integrate
.. //depot/projects/netperf/sys/net/net_osdep.c#3 integrate
.. //depot/projects/netperf/sys/net/net_osdep.h#3 integrate
.. //depot/projects/netperf/sys/net/ppp_tty.c#2 integrate
.. //depot/projects/netperf/sys/net/route.c#25 integrate
.. //depot/projects/netperf/sys/net/route.h#12 integrate
.. //depot/projects/netperf/sys/net/rtsock.c#8 integrate
.. //depot/projects/netperf/sys/net80211/ieee80211_node.c#14 integrate
.. //depot/projects/netperf/sys/net80211/ieee80211_proto.c#7 integrate
.. //depot/projects/netperf/sys/netatalk/ddp_output.c#5 integrate
.. //depot/projects/netperf/sys/netatm/atm_if.c#4 integrate
.. //depot/projects/netperf/sys/netatm/atm_if.h#2 integrate
.. //depot/projects/netperf/sys/netatm/atm_socket.c#3 integrate
.. //depot/projects/netperf/sys/netatm/atm_usrreq.c#3 integrate
.. //depot/projects/netperf/sys/netatm/atm_var.h#3 integrate
.. //depot/projects/netperf/sys/netatm/ipatm/ipatm_usrreq.c#4 integrate
.. //depot/projects/netperf/sys/netatm/spans/spans_arp.c#3 integrate
.. //depot/projects/netperf/sys/netatm/uni/uniarp.c#4 integrate
.. //depot/projects/netperf/sys/netgraph/atm/ng_atm.c#3 integrate
.. //depot/projects/netperf/sys/netgraph/ng_bridge.c#2 integrate
.. //depot/projects/netperf/sys/netgraph/ng_eiface.c#2 integrate
.. //depot/projects/netperf/sys/netgraph/ng_ether.c#3 integrate
.. //depot/projects/netperf/sys/netgraph/ng_fec.c#2 integrate
.. //depot/projects/netperf/sys/netgraph/ng_gif.c#2 integrate
.. //depot/projects/netperf/sys/netgraph/ng_iface.c#2 integrate
.. //depot/projects/netperf/sys/netinet/if_ether.c#14 integrate
.. //depot/projects/netperf/sys/netinet/in_pcb.c#9 integrate
.. //depot/projects/netperf/sys/netinet/in_rmx.c#12 integrate
.. //depot/projects/netperf/sys/netinet/ip_divert.c#9 integrate
.. //depot/projects/netperf/sys/netinet/ip_dummynet.c#15 integrate
.. //depot/projects/netperf/sys/netinet/ip_fw.h#4 integrate
.. //depot/projects/netperf/sys/netinet/ip_fw2.c#13 integrate
.. //depot/projects/netperf/sys/netinet/ip_mroute.c#18 integrate
.. //depot/projects/netperf/sys/netinet6/esp_input.c#5 integrate
.. //depot/projects/netperf/sys/netinet6/icmp6.c#14 integrate
.. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#12 integrate
.. //depot/projects/netperf/sys/netinet6/in6_ifattach.h#2 integrate
.. //depot/projects/netperf/sys/netinet6/in6_pcb.c#13 integrate
.. //depot/projects/netperf/sys/netinet6/in6_rmx.c#12 integrate
.. //depot/projects/netperf/sys/netinet6/ip6_fw.c#6 integrate
.. //depot/projects/netperf/sys/netinet6/ip6_fw.h#3 integrate
.. //depot/projects/netperf/sys/netinet6/ip6_input.c#17 integrate
.. //depot/projects/netperf/sys/netinet6/ip6_mroute.c#6 integrate
.. //depot/projects/netperf/sys/netinet6/ip6_output.c#20 integrate
.. //depot/projects/netperf/sys/netinet6/mld6.c#5 integrate
.. //depot/projects/netperf/sys/netinet6/mld6_var.h#3 integrate
.. //depot/projects/netperf/sys/netinet6/nd6.h#7 integrate
.. //depot/projects/netperf/sys/netinet6/nd6_nbr.c#7 integrate
.. //depot/projects/netperf/sys/netipx/ipx_ip.c#2 integrate
.. //depot/projects/netperf/sys/netnatm/natm.c#4 integrate
.. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#6 integrate
.. //depot/projects/netperf/sys/nfsclient/nfs_diskless.c#3 integrate
.. //depot/projects/netperf/sys/pc98/i386/machdep.c#7 integrate
.. //depot/projects/netperf/sys/pc98/pc98/syscons_pc98.c#2 integrate
.. //depot/projects/netperf/sys/pci/if_dc.c#10 integrate
.. //depot/projects/netperf/sys/pci/if_de.c#3 integrate
.. //depot/projects/netperf/sys/pci/if_devar.h#2 integrate
.. //depot/projects/netperf/sys/pci/if_pcn.c#3 integrate
.. //depot/projects/netperf/sys/pci/if_rl.c#9 integrate
.. //depot/projects/netperf/sys/pci/if_sf.c#3 integrate
.. //depot/projects/netperf/sys/pci/if_sis.c#13 integrate
.. //depot/projects/netperf/sys/pci/if_sk.c#4 integrate
.. //depot/projects/netperf/sys/pci/if_ste.c#3 integrate
.. //depot/projects/netperf/sys/pci/if_ti.c#5 integrate
.. //depot/projects/netperf/sys/pci/if_tl.c#3 integrate
.. //depot/projects/netperf/sys/pci/if_vr.c#3 integrate
.. //depot/projects/netperf/sys/pci/if_wb.c#3 integrate
.. //depot/projects/netperf/sys/pci/if_xl.c#7 integrate
.. //depot/projects/netperf/sys/security/mac_biba/mac_biba.c#4 integrate
.. //depot/projects/netperf/sys/security/mac_lomac/mac_lomac.c#4 integrate
.. //depot/projects/netperf/sys/sys/cdefs.h#4 integrate
.. //depot/projects/netperf/sys/sys/param.h#10 integrate
.. //depot/projects/netperf/sys/sys/proc.h#8 integrate
.. //depot/projects/netperf/sys/ufs/ffs/ffs_alloc.c#2 integrate
.. //depot/projects/netperf/sys/vm/swap_pager.c#11 integrate
.. //depot/projects/netperf/sys/vm/vm_map.c#10 integrate
.. //depot/projects/netperf/sys/vm/vm_object.c#9 integrate

Differences ...

==== //depot/projects/netperf/sys/alpha/osf1/osf1_ioctl.c#3 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.10 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.12 2003/10/31 18:31:55 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -207,7 +207,7 @@
 			 * because osf/1 doesn't know about most of them.
 			 */
 			if (ifp->if_type == IFT_ETHER 
-			    && strcmp(ifp->if_name, "ti")) {	/* looks good */
+			    && strcmp(ifp->if_dname, "ti") != 0) {	/* looks good */
 				/* walk the address list */
 				TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 					if ((sdl = (struct sockaddr_dl *)ifa->ifa_addr)	/* we have an address structure */

==== //depot/projects/netperf/sys/compat/linux/linux_ioctl.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.111 2003/10/20 17:56:10 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.112 2003/10/31 18:31:55 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1881,8 +1881,7 @@
 
 	/* Short-circuit non ethernet interfaces */
 	if (!IFP_IS_ETH(ifp))
-		return (snprintf(buffer, buflen, "%s%d", ifp->if_name,
-		    ifp->if_unit));
+		return (strlcpy(buffer, ifp->if_xname, buflen));
 
 	/* Determine the (relative) unit number for ethernet interfaces */
 	ethno = 0;
@@ -1932,15 +1931,14 @@
 		 * we never have an interface named "eth", so don't make
 		 * the test optional based on is_eth.
 		 */
-		if (ifp->if_unit == unit && ifp->if_name[len] == '\0' &&
-		    strncmp(ifp->if_name, lxname, len) == 0)
+		if (strncmp(ifp->if_xname, lxname, LINUX_IFNAMSIZ) == 0)
 			break;
 		if (is_eth && IFP_IS_ETH(ifp) && unit == index++)
 			break;
 	}
 	IFNET_RUNLOCK();
 	if (ifp != NULL)
-		snprintf(bsdname, IFNAMSIZ, "%s%d", ifp->if_name, ifp->if_unit);
+		strlcpy(bsdname, ifp->if_xname, IFNAMSIZ);
 	return (ifp);
 }
 
@@ -1988,8 +1986,7 @@
 			snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "eth%d",
 			    ethno++);
 		else
-			snprintf(ifr.ifr_name, LINUX_IFNAMSIZ, "%s%d",
-			    ifp->if_name, ifp->if_unit);
+			strlcpy(ifr.ifr_name, ifp->if_xname, LINUX_IFNAMSIZ);
 
 		/* Walk the address list */
 		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {

==== //depot/projects/netperf/sys/conf/options.i386#3 (text+ko) ====

@@ -1,19 +1,19 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.197 2003/08/31 16:20:34 phk Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.198 2003/10/30 21:45:34 jhb Exp $
 # Options specific to the i386 platform kernels
 
+AUTO_EOI_1		opt_auto_eoi.h
+AUTO_EOI_2		opt_auto_eoi.h
+BROKEN_KEYBOARD_RESET	opt_reset.h
+COMPAT_OLDISA
+I586_PMC_GUPROF		opt_i586_guprof.h
+MAXMEM
+PERFMON
 DISABLE_PSE		opt_pmap.h
+DISABLE_PG_G		opt_pmap.h
 PMAP_SHPGPERPROC	opt_pmap.h
-DISABLE_PG_G		opt_pmap.h
 PPC_PROBE_CHIPSET	opt_ppc.h
 PPC_DEBUG		opt_ppc.h
-MAXMEM
-PERFMON			opt_perfmon.h
 POWERFAIL_NMI		opt_trap.h
-AUTO_EOI_1		opt_auto_eoi.h
-AUTO_EOI_2		opt_auto_eoi.h
-I586_PMC_GUPROF		opt_i586_guprof.h
-COMPAT_OLDISA
-BROKEN_KEYBOARD_RESET	opt_reset.h
 
 # Options for emulators.  These should only be used at config time, so
 # they are handled like options for static filesystems

==== //depot/projects/netperf/sys/conf/options.pc98#2 (text+ko) ====

@@ -1,19 +1,19 @@
-# $FreeBSD: src/sys/conf/options.pc98,v 1.167 2003/07/22 08:11:12 peter Exp $
+# $FreeBSD: src/sys/conf/options.pc98,v 1.168 2003/10/31 13:50:09 nyan Exp $
 # Options specific to the pc98 platform kernels
 
+AUTO_EOI_1		opt_auto_eoi.h
+AUTO_EOI_2		opt_auto_eoi.h
+BROKEN_KEYBOARD_RESET	opt_reset.h
+COMPAT_OLDISA
+I586_PMC_GUPROF		opt_i586_guprof.h
+MAXMEM
+PERFMON
 DISABLE_PSE		opt_pmap.h
+DISABLE_PG_G		opt_pmap.h
 PMAP_SHPGPERPROC	opt_pmap.h
-DISABLE_PG_G		opt_pmap.h
 PPC_PROBE_CHIPSET	opt_ppc.h
 PPC_DEBUG		opt_ppc.h
-MAXMEM
-PERFMON			opt_perfmon.h
 POWERFAIL_NMI		opt_trap.h
-AUTO_EOI_1		opt_auto_eoi.h
-AUTO_EOI_2		opt_auto_eoi.h
-I586_PMC_GUPROF		opt_i586_guprof.h
-COMPAT_OLDISA
-BROKEN_KEYBOARD_RESET	opt_reset.h
 
 # Options for emulators.  These should only be used at config time, so
 # they are handled like options for static filesystems

==== //depot/projects/netperf/sys/contrib/dev/oltr/if_oltr.c#4 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.30 2003/08/22 15:28:22 imp Exp $
+ * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.31 2003/10/31 18:31:56 brooks Exp $
  */
 
 #include <sys/param.h>
@@ -394,8 +394,7 @@
 	 * Do the ifnet initialization
 	 */
 	ifp->if_softc	= sc;
-	ifp->if_unit	= device_get_unit(dev);
-	ifp->if_name	= "oltr";
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_init	= oltr_init;
 	ifp->if_start	= oltr_start;
 	ifp->if_ioctl	= oltr_ioctl;

==== //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_compat.h#2 (text+ko) ====

@@ -5,7 +5,7 @@
  *
  * @(#)ip_compat.h	1.8 1/14/96
  * $Id: ip_compat.h,v 2.26.2.9 2001/01/14 14:58:01 darrenr Exp $
- * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.20 2003/02/15 06:23:45 darrenr Exp $
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.21 2003/10/31 18:31:56 brooks Exp $
  */
 
 #ifndef	__IP_COMPAT_H__
@@ -542,7 +542,8 @@
 #  ifndef	linux
 #   define	GETUNIT(n, v)	ifunit(n)
 #   if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
-        (defined(OpenBSD) && (OpenBSD >= 199603))
+        (defined(OpenBSD) && (OpenBSD >= 199603)) || \
+	(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
 #    define	IFNAME(x)	((struct ifnet *)x)->if_xname
 #   else
 #    define	USE_GETIFNAME	1

==== //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_fil.c#7 (text+ko) ====

@@ -131,7 +131,7 @@
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_fil.c	2.41 6/5/96 (C) 1993-2000 Darren Reed";
 /* static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.42.2.34 2001/07/23 13:49:57 darrenr Exp $"; */
-static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.41 2003/10/17 20:20:14 ume Exp $";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.42 2003/10/31 18:31:56 brooks Exp $";
 #endif
 
 extern	struct	protosw	inetsw[];
@@ -2075,7 +2075,8 @@
 	int fd;
 
 # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
-	(defined(OpenBSD) && (OpenBSD >= 199603))
+	(defined(OpenBSD) && (OpenBSD >= 199603)) || \
+	(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
 	sprintf(fname, "%s", ifp->if_xname);
 # else
 	sprintf(fname, "%s%d", ifp->if_name, ifp->if_unit);
@@ -2095,7 +2096,8 @@
 struct ifnet *ifp;
 {
 # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
-     (defined(OpenBSD) && (OpenBSD >= 199603))
+     (defined(OpenBSD) && (OpenBSD >= 199603)) || \
+     (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
 	return ifp->if_xname;
 # else
 	static char fullifname[LIFNAMSIZ];
@@ -2114,7 +2116,8 @@
 
 	for (ifa = ifneta; ifa && (ifp = *ifa); ifa++) {
 # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
-     (defined(OpenBSD) && (OpenBSD >= 199603))
+     (defined(OpenBSD) && (OpenBSD >= 199603)) || \
+     (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
 		if (!strncmp(ifname, ifp->if_xname, sizeof(ifp->if_xname)))
 # else
 		char fullname[LIFNAMSIZ];
@@ -2156,7 +2159,8 @@
 	ifp = ifneta[nifs - 1];
 
 # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
-     (defined(OpenBSD) && (OpenBSD >= 199603))
+     (defined(OpenBSD) && (OpenBSD >= 199603)) || \
+     (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
 	strncpy(ifp->if_xname, ifname, sizeof(ifp->if_xname));
 # else
 	ifp->if_name = strdup(ifname);
@@ -2183,7 +2187,8 @@
 	int fd;
 
 # if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \
-	(defined(OpenBSD) && (OpenBSD >= 199603))
+	(defined(OpenBSD) && (OpenBSD >= 199603)) || \
+	(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
 	for (ifa = ifneta; ifa && (ifp = *ifa); ifa++) {
 		ifp->if_output = write_output;
 		sprintf(fname, "/tmp/%s", ifp->if_xname);

==== //depot/projects/netperf/sys/contrib/ipfilter/netinet/ip_log.c#2 (text+ko) ====

@@ -4,7 +4,7 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * $Id: ip_log.c,v 2.5.2.1 2000/07/19 13:11:47 darrenr Exp $
- * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.24 2003/02/15 06:23:45 darrenr Exp $
+ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.25 2003/10/31 18:31:56 brooks Exp $
  */
 #include <sys/param.h>
 #if defined(KERNEL) && !defined(_KERNEL)
@@ -253,7 +253,8 @@
 	mlen = (flags & FR_LOGBODY) ? MIN(msgdsize(m) - hlen, 128) : 0;
 # else
 #  if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
-	(defined(OpenBSD) && (OpenBSD >= 199603))
+	(defined(OpenBSD) && (OpenBSD >= 199603) || \
+	(defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) )
 	strncpy(ipfl.fl_ifname, ifp->if_xname, IFNAMSIZ);
 #  else
 	ipfl.fl_unit = (u_char)ifp->if_unit;

==== //depot/projects/netperf/sys/dev/an/if_an.c#4 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.54 2003/08/24 17:48:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.55 2003/10/31 18:31:56 brooks Exp $");
 
 /*
  * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
@@ -752,8 +752,9 @@
 	    sc->arpcom.ac_enaddr, ":");
 
 	ifp->if_softc = sc;
-	ifp->if_unit = sc->an_unit = unit;
-	ifp->if_name = "an";
+	sc->an_unit = unit;
+	if_initname(ifp, device_get_name(sc->an_dev),
+	    device_get_unit(sc->an_dev));
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = an_ioctl;

==== //depot/projects/netperf/sys/dev/ar/if_ar.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.59 2003/08/24 17:48:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ar/if_ar.c,v 1.60 2003/10/31 18:31:56 brooks Exp $");
 
 /*
  * Programming assumptions and other issues.
@@ -293,8 +293,8 @@
 		ifp = &sc->ifsppp.pp_if;
 
 		ifp->if_softc = sc;
-		ifp->if_unit = sc->unit;
-		ifp->if_name = "ar";
+		if_initname(ifp, device_get_name(device),
+		    device_get_unit(device));
 		ifp->if_mtu = PP_MTU;
 		ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
 		ifp->if_ioctl = arioctl;

==== //depot/projects/netperf/sys/dev/ath/if_ath.c#30 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.29 2003/10/22 04:37:34 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.30 2003/10/31 18:31:56 brooks Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -213,8 +213,8 @@
 	DPRINTF(("ath_attach: devid 0x%x\n", devid));
 
 	/* set these up early for if_printf use */
-	ifp->if_unit = device_get_unit(sc->sc_dev);
-	ifp->if_name = "ath";
+	if_initname(ifp, device_get_name(sc->sc_dev),
+	    device_get_unit(sc->sc_dev));
 
 	ah = ath_hal_attach(devid, sc, sc->sc_st, sc->sc_sh, &status);
 	if (ah == NULL) {

==== //depot/projects/netperf/sys/dev/awi/if_awi_pccard.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.12 2003/08/24 17:48:06 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.14 2003/10/31 18:31:57 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -141,15 +141,9 @@
 	psc->sc_mem_res = 0;
 	psc->sc_intrhand = 0;
 
-	ifp->if_name = "awi";
-	ifp->if_unit = device_get_unit(dev);
-	if (ifp->if_name == NULL) {
-		printf("awi%d: awi_pccard_attach: cannot get device name\n",
-		    device_get_unit(dev));
-		goto fail;
-	}
-	snprintf(sc->sc_dev.dv_xname, sizeof(sc->sc_dev.dv_xname),
-	    "%s%d", ifp->if_name, ifp->if_unit);
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
+	strlcpy(sc->sc_dev.dv_xname, ifp->if_xname,
+	    sizeof(sc->sc_dev.dv_xname));
 
 	psc->sc_port_rid = 0;
 	psc->sc_port_res = bus_alloc_resource(dev, SYS_RES_IOPORT,

==== //depot/projects/netperf/sys/dev/bfe/if_bfe.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.2 2003/09/09 18:21:17 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.3 2003/10/31 18:31:57 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -368,8 +368,7 @@
 	/* Set up ifnet structure */
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = sc->bfe_unit;
-	ifp->if_name = "bfe";
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = bfe_ioctl;
 	ifp->if_output = ether_output;

==== //depot/projects/netperf/sys/dev/bge/if_bge.c#11 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.55 2003/09/23 19:54:32 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.57 2003/10/31 18:31:57 brooks Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.55 2003/09/23 19:54:32 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.57 2003/10/31 18:31:57 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/endian.h>
@@ -157,6 +157,8 @@
 		"Broadcom BCM5705M Gigabit Ethernet" },
 	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5782,
 		"Broadcom BCM5782 Gigabit Ethernet" },
+	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5788,
+		"Broadcom BCM5788 Gigabit Ethernet" },
 	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5901,
 		"Broadcom BCM5901 Fast Ethernet" },
 	{ BCOM_VENDORID, BCOM_DEVICEID_BCM5901A2,
@@ -2358,8 +2360,7 @@
 	/* Set up ifnet structure */
 	ifp = &sc->arpcom.ac_if;
 	ifp->if_softc = sc;
-	ifp->if_unit = sc->bge_unit;
-	ifp->if_name = "bge";
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = bge_ioctl;
 	ifp->if_output = ether_output;

==== //depot/projects/netperf/sys/dev/bge/if_bgereg.h#6 (text+ko) ====

@@ -30,7 +30,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.23 2003/08/20 04:06:00 ambrisko Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.24 2003/10/31 16:25:39 wpaul Exp $
  */
 
 /*
@@ -1822,6 +1822,7 @@
 #define BCOM_DEVICEID_BCM5705M		0x165D
 #define BCOM_DEVICEID_BCM5705M_ALT	0x165E
 #define BCOM_DEVICEID_BCM5782		0x1696
+#define BCOM_DEVICEID_BCM5788		0x169C
 #define BCOM_DEVICEID_BCM5901		0x170D
 #define BCOM_DEVICEID_BCM5901A2		0x170E
 

==== //depot/projects/netperf/sys/dev/cm/if_cm_isa.c#3 (text+ko) ====

@@ -1,7 +1,7 @@
 /*	$NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.4 2003/08/24 17:46:02 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.5 2003/10/31 18:31:58 brooks Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
 		return (error);
 	}
 
-	return cm_attach(sc, device_get_unit(dev));
+	return cm_attach(dev);
 }
 
 static int

==== //depot/projects/netperf/sys/dev/cm/smc90cx6.c#4 (text+ko) ====

@@ -1,7 +1,7 @@
 /*	$NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.11 2003/10/30 19:45:57 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.12 2003/10/31 18:31:58 brooks Exp $");
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -274,10 +274,10 @@
 }
 
 int
-cm_attach(sc, unit)
-	struct cm_softc *sc;
-	int unit;
+cm_attach(dev)
+	device_t dev;
 {
+	struct cm_softc *sc = device_get_softc(dev);
 	struct ifnet *ifp = &sc->sc_arccom.ac_if;
 	int s;
 	u_int8_t linkaddress;
@@ -313,8 +313,7 @@
 	cm_stop(sc);
 
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "cm";
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_output = arc_output;
 	ifp->if_start = cm_start;
 	ifp->if_ioctl = cm_ioctl;
@@ -841,8 +840,8 @@
 			 */
 			PUTREG(CMCMD, CM_CLR(CLR_POR));
 			log(LOG_WARNING,
-			    "%s%d: intr: got spurious power on reset int\n",
-			    ifp->if_name, ifp->if_unit);
+			    "%s: intr: got spurious power on reset int\n",
+			    ifp->if_xname);
 		}
 
 		if (maskedisr & CM_RECON) {
@@ -872,9 +871,9 @@
 			if ((newsec - sc->sc_recontime <= 2) &&
 			    (++sc->sc_reconcount == ARC_EXCESSIVE_RECONS)) {
 				log(LOG_WARNING,
-				    "%s%d: excessive token losses, "
+				    "%s: excessive token losses, "
 				    "cable problem?\n",
-				    ifp->if_name, ifp->if_unit);
+				    ifp->if_xname);
 			}
 			sc->sc_recontime = newsec;
 			callout_reset(&sc->sc_recon_ch, 15 * hz,
@@ -895,8 +894,8 @@
 				 * configured sender)
 				 */
 				log(LOG_WARNING,
-				    "%s%d: spurious RX interupt or sender 0 "
-				    " (ignored)\n", ifp->if_name, ifp->if_unit);
+				    "%s: spurious RX interupt or sender 0 "
+				    " (ignored)\n", ifp->if_xname);
 				/*
 				 * restart receiver on same buffer.
 				 * XXX maybe better reset interface?
@@ -958,8 +957,8 @@
 
 	if (sc->sc_reconcount >= ARC_EXCESSIVE_RECONS) {
 		sc->sc_reconcount = 0;
-		log(LOG_WARNING, "%s%d: token valid again.\n",
-		    ifp->if_name, ifp->if_unit);
+		log(LOG_WARNING, "%s: token valid again.\n",
+		    ifp->if_xname);
 	}
 	sc->sc_reconcount = 0;
 }

==== //depot/projects/netperf/sys/dev/cm/smc90cx6var.h#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*	$NetBSD: smc90cx6var.h,v 1.5 2000/03/23 07:01:32 thorpej Exp $	*/
-/*	$FreeBSD: src/sys/dev/cm/smc90cx6var.h,v 1.2 2002/03/20 02:04:09 alfred Exp $ */
+/*	$FreeBSD: src/sys/dev/cm/smc90cx6var.h,v 1.3 2003/10/31 18:31:58 brooks Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
 	u_char	sc_retransmits[2];	/* unused at the moment */
 };
 
-int	cm_attach(struct cm_softc *, int unit);
+int	cm_attach(device_t dev);
 void	cmintr(void *);
 
 int	cm_probe(device_t dev);

==== //depot/projects/netperf/sys/dev/cnw/if_cnw.c#3 (text+ko) ====

@@ -2,7 +2,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.12 2003/08/24 17:46:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.13 2003/10/31 18:31:58 brooks Exp $");
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -1632,8 +1632,7 @@
 		sc->arpcom.ac_enaddr, ":");
 
 	ifp->if_softc = sc;
-	ifp->if_name = "cnw";
-	ifp->if_unit = device_get_unit(dev);
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_timer = 0;
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST);

==== //depot/projects/netperf/sys/dev/cs/if_cs.c#4 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.26 2003/10/30 19:45:57 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs.c,v 1.27 2003/10/31 18:31:58 brooks Exp $");
 
 /*
  *
@@ -575,16 +575,16 @@
  * Install the interface into kernel networking data structures
  */
 int
-cs_attach(struct cs_softc *sc, int unit, int flags)
+cs_attach(device_t dev)
 {
         int media=0;
+	struct cs_softc *sc = device_get_softc(dev);;
 	struct ifnet *ifp = &(sc->arpcom.ac_if);
 
 	cs_stop( sc );
 
 	ifp->if_softc=sc;
-	ifp->if_unit=unit;
-	ifp->if_name="cs";
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_output=ether_output;
 	ifp->if_start=cs_start;
 	ifp->if_ioctl=cs_ioctl;
@@ -607,8 +607,8 @@
 
 	sc->recv_ring=malloc(CS_DMA_BUFFER_SIZE<<1, M_DEVBUF, M_NOWAIT);
 	if (sc->recv_ring == NULL) {
-		log(LOG_ERR,CS_NAME
-		"%d: Couldn't allocate memory for NIC\n", unit);
+		log(LOG_ERR,
+		"%s: Couldn't allocate memory for NIC\n", ifp->if_xname);
 		return(0);
 	}
 	if ((sc->recv_ring-(sc->recv_ring & 0x1FFFF))
@@ -1137,7 +1137,7 @@
 	struct cs_softc *sc = ifp->if_softc;
 
 	ifp->if_oerrors++;
-	log(LOG_ERR, CS_NAME"%d: device timeout\n", ifp->if_unit);
+	log(LOG_ERR, "%s: device timeout\n", ifp->if_xname);
 
 	/* Reset the interface */
 	if (ifp->if_flags & IFF_UP)

==== //depot/projects/netperf/sys/dev/cs/if_cs_isa.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.4 2003/08/24 17:46:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.5 2003/10/31 18:31:58 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -90,7 +90,6 @@
 cs_isa_attach(device_t dev)
 {
         struct cs_softc *sc = device_get_softc(dev);
-        int flags = device_get_flags(dev);
         int error;
         
 	cs_alloc_port(dev, 0, CS_89x0_IO_PORTS);
@@ -106,7 +105,7 @@
                 return (error);
         }              
 
-        return (cs_attach(sc, device_get_unit(dev), flags));
+        return (cs_attach(dev));
 }
 
 static device_method_t cs_isa_methods[] = {

==== //depot/projects/netperf/sys/dev/cs/if_cs_pccard.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.7 2003/08/24 17:46:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.8 2003/10/31 18:31:58 brooks Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -81,7 +81,6 @@
 cs_pccard_attach(device_t dev)
 {
         struct cs_softc *sc = device_get_softc(dev);
-        int flags = device_get_flags(dev);
         int error;
         
 	error = cs_alloc_port(dev, sc->port_rid, CS_89x0_IO_PORTS);
@@ -95,7 +94,7 @@
         if (error != 0)
 		goto bad;
 
-        return (cs_attach(sc, device_get_unit(dev), flags));
+        return (cs_attach(dev));
 bad:
 	cs_release_resources(dev);
 	return (error);

==== //depot/projects/netperf/sys/dev/cs/if_csvar.h#2 (text+ko) ====

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/cs/if_csvar.h,v 1.1 2001/01/21 04:56:12 imp Exp $
+ * $FreeBSD: src/sys/dev/cs/if_csvar.h,v 1.2 2003/10/31 18:31:58 brooks Exp $
  */
 
 #ifndef _IF_CSVAR_H
@@ -70,7 +70,7 @@
 int	cs_alloc_port(device_t dev, int rid, int size);
 int	cs_alloc_memory(device_t dev, int rid, int size);
 int	cs_alloc_irq(device_t dev, int rid, int flags);
-int	cs_attach(struct cs_softc *, int, int);
+int	cs_attach(device_t dev);
 int	cs_cs89x0_probe(device_t dev);
 void	cs_release_resources(device_t dev);
 driver_intr_t	csintr;

==== //depot/projects/netperf/sys/dev/ed/if_ed.c#5 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.220 2003/10/30 19:45:57 brooks Exp $
+ * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.221 2003/10/31 18:31:58 brooks Exp $
  */
 
 /*
@@ -1700,11 +1700,10 @@
  * Install interface into kernel networking data structures
  */
 int
-ed_attach(sc, unit, flags)
-	struct ed_softc *sc;
-	int unit;
-	int flags;
+ed_attach(dev)
+	device_t dev;
 {
+	struct ed_softc *sc = device_get_softc(dev);
 	struct ifnet *ifp = &sc->arpcom.ac_if;
 
 	callout_handle_init(&sc->tick_ch);
@@ -1717,8 +1716,7 @@
 	 * Initialize ifnet structure
 	 */
 	ifp->if_softc = sc;
-	ifp->if_unit = unit;
-	ifp->if_name = "ed";
+	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_output = ether_output;
 	ifp->if_start = ed_start;
 	ifp->if_ioctl = ed_ioctl;
@@ -1745,7 +1743,7 @@
 	 * tranceiver for AUI operation), based on compile-time 
 	 * config option.
 	 */
-	if (flags & ED_FLAGS_DISABLE_TRANCEIVER)
+	if (device_get_flags(dev) & ED_FLAGS_DISABLE_TRANCEIVER)
 		ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | 
 		    IFF_MULTICAST | IFF_ALTPHYS);
 	else
@@ -1846,7 +1844,7 @@
 
 	if (sc->gone)
 		return;
-	log(LOG_ERR, "ed%d: device timeout\n", ifp->if_unit);
+	log(LOG_ERR, "%s: device timeout\n", ifp->if_xname);
 	ifp->if_oerrors++;
 
 	ed_reset(ifp);
@@ -2349,8 +2347,8 @@
 			 * Really BAD. The ring pointers are corrupted.
 			 */
 			log(LOG_ERR,
-			    "ed%d: NIC memory corrupt - invalid packet length %d\n",
-			    ifp->if_unit, len);
+			    "%s: NIC memory corrupt - invalid packet length %d\n",
+			    ifp->if_xname, len);
 			ifp->if_ierrors++;
 			ed_reset(ifp);
 			return;
@@ -2554,8 +2552,8 @@
 				ifp->if_ierrors++;
 #ifdef DIAGNOSTIC
 				log(LOG_WARNING,
-				    "ed%d: warning - receiver ring buffer overrun\n",
-				    ifp->if_unit);
+				    "%s: warning - receiver ring buffer overrun\n",
+				    ifp->if_xname);
 #endif
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<