Skip to content

Commit cd7b8b6

Browse files
thorpejthorpej
committed
These drivers can use ether_getaddr() instead of prom_getether() now.
1 parent 2ec4c07 commit cd7b8b6

7 files changed

Lines changed: 40 additions & 24 deletions

File tree

‎sys/dev/sbus/be.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: be.c,v 1.98 2022/09/25 18:03:04 thorpej Exp $ */
1+
/* $NetBSD: be.c,v 1.99 2025/10/15 01:36:25 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
5757
*/
5858

5959
#include <sys/cdefs.h>
60-
__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.98 2022/09/25 18:03:04 thorpej Exp $");
60+
__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.99 2025/10/15 01:36:25 thorpej Exp $");
6161

6262
#include "opt_ddb.h"
6363
#include "opt_inet.h"
@@ -278,7 +278,7 @@ beattach(device_t parent, device_t self, void *aux)
278278
(void)bus_intr_establish(sa->sa_bustag, sa->sa_pri, IPL_NET,
279279
beintr, sc);
280280

281-
prom_getether(node, sc->sc_enaddr);
281+
ether_getaddr(self, sc->sc_enaddr);
282282
printf(" address %s\n", ether_sprintf(sc->sc_enaddr));
283283

284284
/*

‎sys/dev/sbus/if_gem_sbus.c‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: if_gem_sbus.c,v 1.14 2022/09/25 18:03:04 thorpej Exp $ */
1+
/* $NetBSD: if_gem_sbus.c,v 1.15 2025/10/15 01:36:25 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
3434
*/
3535

3636
#include <sys/cdefs.h>
37-
__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.14 2022/09/25 18:03:04 thorpej Exp $");
37+
__KERNEL_RCSID(0, "$NetBSD: if_gem_sbus.c,v 1.15 2025/10/15 01:36:25 thorpej Exp $");
3838

3939
#include <sys/param.h>
4040
#include <sys/systm.h>
@@ -99,6 +99,11 @@ gemattach_sbus(device_t parent, device_t self, void *aux)
9999
return;
100100
}
101101

102+
if (! ether_getaddr(self, enaddr)) {
103+
aprint_error(": unable to get MAC address\n");
104+
return;
105+
}
106+
102107
/*
103108
* Map two register banks:
104109
*
@@ -122,7 +127,6 @@ gemattach_sbus(device_t parent, device_t self, void *aux)
122127
aprint_error_dev(self, "cannot map registers\n");
123128
return;
124129
}
125-
prom_getether(sa->sa_node, enaddr);
126130

127131
if (!strcmp("serdes", prom_getpropstring(sa->sa_node, "shared-pins")))
128132
sc->sc_flags |= GEM_SERDES;

‎sys/dev/sbus/if_hme_sbus.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: if_hme_sbus.c,v 1.34 2022/09/25 18:03:04 thorpej Exp $ */
1+
/* $NetBSD: if_hme_sbus.c,v 1.35 2025/10/15 01:36:25 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
3434
*/
3535

3636
#include <sys/cdefs.h>
37-
__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.34 2022/09/25 18:03:04 thorpej Exp $");
37+
__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.35 2025/10/15 01:36:25 thorpej Exp $");
3838

3939
#include <sys/param.h>
4040
#include <sys/systm.h>
@@ -104,6 +104,11 @@ hmeattach_sbus(device_t parent, device_t self, void *aux)
104104
return;
105105
}
106106

107+
if (! ether_getaddr(self, sc->sc_enaddr)) {
108+
aprint_error_dev(self, "unable to get MAC address\n");
109+
return;
110+
}
111+
107112
/*
108113
* Map five register banks:
109114
*
@@ -155,8 +160,6 @@ hmeattach_sbus(device_t parent, device_t self, void *aux)
155160
return;
156161
}
157162

158-
prom_getether(node, sc->sc_enaddr);
159-
160163
/*
161164
* Get transfer burst size from PROM and pass it on
162165
* to the back-end driver.

‎sys/dev/sbus/if_le.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: if_le.c,v 1.43 2022/09/25 18:03:04 thorpej Exp $ */
1+
/* $NetBSD: if_le.c,v 1.44 2025/10/15 01:36:25 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
3131
*/
3232

3333
#include <sys/cdefs.h>
34-
__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.43 2022/09/25 18:03:04 thorpej Exp $");
34+
__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.44 2025/10/15 01:36:25 thorpej Exp $");
3535

3636
#include "opt_inet.h"
3737

@@ -150,6 +150,11 @@ leattach_sbus(device_t parent, device_t self, void *aux)
150150
lesc->sc_bustag = sa->sa_bustag;
151151
lesc->sc_dmatag = dmatag = sa->sa_dmatag;
152152

153+
if (! ether_getaddr(self, sc->sc_enaddr)) {
154+
aprint_error(": unable to get MAC address\n");
155+
return;
156+
}
157+
153158
if (sbus_bus_map(sa->sa_bustag,
154159
sa->sa_slot,
155160
sa->sa_offset,
@@ -261,8 +266,6 @@ leattach_sbus(device_t parent, device_t self, void *aux)
261266
sc->sc_conf3 = LE_C3_BSWP | LE_C3_ACON | LE_C3_BCON;
262267
}
263268

264-
prom_getether(sa->sa_node, sc->sc_enaddr);
265-
266269
sc->sc_supmedia = lemedia;
267270
sc->sc_nsupmedia = NLEMEDIA;
268271
sc->sc_defaultmedia = lemedia[0];

‎sys/dev/sbus/if_le_lebuffer.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: if_le_lebuffer.c,v 1.30 2022/09/25 18:03:04 thorpej Exp $ */
1+
/* $NetBSD: if_le_lebuffer.c,v 1.31 2025/10/15 01:36:25 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
3131
*/
3232

3333
#include <sys/cdefs.h>
34-
__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.30 2022/09/25 18:03:04 thorpej Exp $");
34+
__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.31 2025/10/15 01:36:25 thorpej Exp $");
3535

3636
#include "opt_inet.h"
3737

@@ -152,6 +152,11 @@ leattach_lebuffer(device_t parent, device_t self, void *aux)
152152
lesc->sc_bustag = sa->sa_bustag;
153153
lesc->sc_dmatag = sa->sa_dmatag;
154154

155+
if (! ether_getaddr(self, sc->sc_enaddr)) {
156+
aprint_error(": unable to get MAC address\n");
157+
return;
158+
}
159+
155160
if (sbus_bus_map(sa->sa_bustag,
156161
sa->sa_slot,
157162
sa->sa_offset,
@@ -174,8 +179,6 @@ leattach_lebuffer(device_t parent, device_t self, void *aux)
174179
sc->sc_nsupmedia = NLEMEDIA;
175180
sc->sc_defaultmedia = lemedia[0];
176181

177-
prom_getether(sa->sa_node, sc->sc_enaddr);
178-
179182
sc->sc_copytodesc = lance_copytobuf_contig;
180183
sc->sc_copyfromdesc = lance_copyfrombuf_contig;
181184
sc->sc_copytobuf = lance_copytobuf_contig;

‎sys/dev/sbus/if_le_ledma.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: if_le_ledma.c,v 1.38 2022/09/25 18:03:04 thorpej Exp $ */
1+
/* $NetBSD: if_le_ledma.c,v 1.39 2025/10/15 01:36:25 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
3131
*/
3232

3333
#include <sys/cdefs.h>
34-
__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.38 2022/09/25 18:03:04 thorpej Exp $");
34+
__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.39 2025/10/15 01:36:25 thorpej Exp $");
3535

3636
#include "opt_inet.h"
3737

@@ -387,7 +387,10 @@ leattach_ledma(device_t parent, device_t self, void *aux)
387387
sc->sc_nsupmedia = NLEMEDIA;
388388
sc->sc_defaultmedia = IFM_ETHER | IFM_AUTO;
389389

390-
prom_getether(sa->sa_node, sc->sc_enaddr);
390+
if (! ether_getaddr(self, sc->sc_enaddr)) {
391+
aprint_error(": unable to get MAC address\n");
392+
goto bad_unmap;
393+
}
391394

392395
sc->sc_copytodesc = lance_copytobuf_contig;
393396
sc->sc_copyfromdesc = lance_copyfrombuf_contig;

‎sys/dev/sbus/qe.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $NetBSD: qe.c,v 1.80 2024/06/29 12:11:12 riastradh Exp $ */
1+
/* $NetBSD: qe.c,v 1.81 2025/10/15 01:36:25 thorpej Exp $ */
22

33
/*-
44
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
6666
*/
6767

6868
#include <sys/cdefs.h>
69-
__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.80 2024/06/29 12:11:12 riastradh Exp $");
69+
__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.81 2025/10/15 01:36:25 thorpej Exp $");
7070

7171
#define QEDEBUG
7272

@@ -227,7 +227,7 @@ qeattach(device_t parent, device_t self, void *aux)
227227

228228
/* Note: no interrupt level passed */
229229
(void)bus_intr_establish(sa->sa_bustag, 0, IPL_NET, qeintr, sc);
230-
prom_getether(node, sc->sc_enaddr);
230+
ether_getaddr(self, sc->sc_enaddr);
231231

232232
/*
233233
* Allocate descriptor ring and buffers.

0 commit comments

Comments
 (0)