From b1374c3956863eccd7c5a2efc2174ef555ab4272 Mon Sep 17 00:00:00 2001
From: hauke <hauke@NetBSD.org>
Date: Wed, 2 Apr 2008 18:36:58 +0000
Subject: [PATCH] Fall-out from splitting device_t and softc for the dp8390
 softc.

---
 sys/arch/mac68k/nubus/if_ae_nubus.c      |  6 +++---
 sys/arch/mac68k/nubus/if_netdock_nubus.c | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/sys/arch/mac68k/nubus/if_ae_nubus.c b/sys/arch/mac68k/nubus/if_ae_nubus.c
index a2e96600de4f..377c3da7be38 100644
--- a/sys/arch/mac68k/nubus/if_ae_nubus.c
+++ b/sys/arch/mac68k/nubus/if_ae_nubus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ae_nubus.c,v 1.38 2006/03/29 04:16:45 thorpej Exp $	*/
+/*	$NetBSD: if_ae_nubus.c,v 1.39 2008/04/02 18:36:58 hauke Exp $	*/
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ae_nubus.c,v 1.38 2006/03/29 04:16:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ae_nubus.c,v 1.39 2008/04/02 18:36:58 hauke Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -500,7 +500,7 @@ ae_nb_watchdog(struct ifnet *ifp)
  */
 	(*via2itab[1])((void *)1);
 
-	log(LOG_ERR, "%s: device timeout\n", sc->sc_dev.dv_xname);
+	log(LOG_ERR, "%s: device timeout\n", sc->sc_dev->dv_xname);
 	++ifp->if_oerrors;
 
 	dp8390_reset(sc);
diff --git a/sys/arch/mac68k/nubus/if_netdock_nubus.c b/sys/arch/mac68k/nubus/if_netdock_nubus.c
index 1b91a2b767aa..b8a05d6869ee 100644
--- a/sys/arch/mac68k/nubus/if_netdock_nubus.c
+++ b/sys/arch/mac68k/nubus/if_netdock_nubus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_netdock_nubus.c,v 1.16 2007/10/17 19:55:15 garbled Exp $	*/
+/*	$NetBSD: if_netdock_nubus.c,v 1.17 2008/04/02 18:40:02 hauke Exp $	*/
 
 /*
  * Copyright (C) 2000,2002 Daishi Kato <daishi@axlight.com>
@@ -43,7 +43,7 @@
 /***********************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.16 2007/10/17 19:55:15 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_netdock_nubus.c,v 1.17 2008/04/02 18:40:02 hauke Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -357,9 +357,9 @@ netdock_setup(struct netdock_softc *sc, u_int8_t *lladdr)
 
 	memcpy(sc->sc_enaddr, lladdr, ETHER_ADDR_LEN);
 	printf("%s: Ethernet address %s\n",
-	    sc->sc_dev.dv_xname, ether_sprintf(lladdr));
+	    sc->sc_dev->dv_xname, ether_sprintf(lladdr));
 
-	memcpy(ifp->if_xname, sc->sc_dev.dv_xname, IFNAMSIZ);
+	memcpy(ifp->if_xname, sc->sc_dev->dv_xname, IFNAMSIZ);
 	ifp->if_softc = sc;
 	ifp->if_ioctl = netdock_ioctl;
 	ifp->if_start = netdock_start;
@@ -450,7 +450,7 @@ netdock_start(struct ifnet *ifp)
 
 		if ((m->m_flags & M_PKTHDR) == 0)
 			panic("%s: netdock_start: no header mbuf",
-				sc->sc_dev.dv_xname);
+				sc->sc_dev->dv_xname);
 
 #if NBPFILTER > 0
 		if (ifp->if_bpf)
@@ -573,7 +573,8 @@ netdock_put(struct netdock_softc *sc, struct mbuf *m0)
 		totlen += m->m_len;
 
 	if (totlen >= ETHER_MAX_LEN)
-		panic("%s: netdock_put: packet overflow", sc->sc_dev.dv_xname);
+		panic("%s: netdock_put: packet overflow",
+		    sc->sc_dev->dv_xname);
 
 	totlen += 6;
 	tmplen = totlen;