git: d5ca52182e52 - main - rge: fix callout setup/teardown; handle invalid ethernet address

The branch main has been updated by adrian:

URL: https://cgit.FreeBSD.org/src/commit/?id=d5ca52182e522a192d0c8fbdaa438f50e200082f

commit d5ca52182e522a192d0c8fbdaa438f50e200082f
Author:     John <john@cybersashi.com>
AuthorDate: 2026-02-22 18:06:39 +0000
Commit:     Adrian Chadd <adrian@FreeBSD.org>
CommitDate: 2026-02-22 18:07:29 +0000

    rge: fix callout setup/teardown; handle invalid ethernet address
    
    * Do the callout init early; since some of the teardown path expects
      the callout to be valid
    
    * Handle an invalid ethernet address by generating a local one.
    
    PR:     kern/293307
    
    Reviewed by:    zlei
    Differential Revision:  https://reviews.freebsd.org/D55419
---
 sys/dev/rge/if_rge.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c
index 443acbbd77c3..5daede0ac95d 100644
--- a/sys/dev/rge/if_rge.c
+++ b/sys/dev/rge/if_rge.c
@@ -67,6 +67,9 @@
 #include "if_rge_sysctl.h"
 #include "if_rge_stats.h"
 
+#define ETHER_IS_VALID(addr) \
+	(!ETHER_IS_MULTICAST(addr.octet) && !ETHER_IS_ZERO(addr.octet))
+
 #define	RGE_CSUM_FEATURES		(CSUM_IP | CSUM_TCP | CSUM_UDP)
 
 static int		rge_attach(device_t);
@@ -182,7 +185,7 @@ rge_attach_if(struct rge_softc *sc, const char *eaddr)
 static int
 rge_attach(device_t dev)
 {
-	uint8_t eaddr[ETHER_ADDR_LEN];
+	struct ether_addr eaddr;
 	struct rge_softc *sc;
 	struct rge_queues *q;
 	uint32_t hwrev, reg;
@@ -196,6 +199,8 @@ rge_attach(device_t dev)
 	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
 	    MTX_DEF);
 
+	callout_init_mtx(&sc->sc_timeout, &sc->sc_mtx, 0);
+
 	/* Enable bus mastering */
 	pci_enable_busmaster(dev);
 
@@ -465,9 +470,15 @@ rge_attach(device_t dev)
 		goto fail;
 	}
 
-	rge_get_macaddr(sc, eaddr);
+	rge_get_macaddr(sc, eaddr.octet);
 	RGE_UNLOCK(sc);
 
+	if (!ETHER_IS_VALID(eaddr)) {
+		device_printf(dev,
+		    "No MAC address found.  Using ether_gen_addr().\n");
+		ether_gen_addr_byname(device_get_nameunit(dev), &eaddr);
+	}
+
 	if (rge_allocmem(sc))
 		goto fail;
 	if (rge_alloc_stats_mem(sc))
@@ -481,7 +492,7 @@ rge_attach(device_t dev)
 	ifmedia_set(&sc->sc_media, IFM_ETHER | IFM_AUTO);
 	sc->sc_media.ifm_media = sc->sc_media.ifm_cur->ifm_media;
 
-	rge_attach_if(sc, eaddr);
+	rge_attach_if(sc, eaddr.octet);
 
 	/*
 	 * TODO: technically should be per txq but we only support
@@ -501,8 +512,6 @@ rge_attach(device_t dev)
 
 	TASK_INIT(&sc->sc_tx_task, 0, rge_tx_task, sc);
 
-	callout_init_mtx(&sc->sc_timeout, &sc->sc_mtx, 0);
-
 	return (0);
 fail:
 	rge_detach(dev);