Fix kernel panic when generating MAC address.

alexdupre · Jul 17, 2023 · 422aad1 · 422aad1
1 parent 733aa05
commit 422aad1
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/if_re.c b/if_re.c
@@ -3689,25 +3689,8 @@ static int re_attach(device_t dev)
         re_reset(sc);
         RE_UNLOCK(sc);
 
-        /* Get station address. */
-        RE_LOCK(sc);
-        re_get_hw_mac_address(sc, eaddr);
-        RE_UNLOCK(sc);
-
-        /*
-         * A RealTek chip was detected. Inform the world.
-         */
-        device_printf(dev,"version:%s\n", RE_VERSION);
-        device_printf(dev,"Ethernet address: %6D\n", eaddr, ":");
-        printf("\nThis product is covered by one or more of the following patents: \
-           \nUS6,570,884, US6,115,776, and US6,327,625.\n");
-
         sc->re_unit = unit;
 
-#if OS_VER < VERSION(6,0)
-        bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
-#endif
-
         if (sc->re_type == MACFG_3) {	/* Change PCI Latency time*/
                 pci_write_config(dev, RE_PCI_LATENCY_TIMER, 0x40, 1);
         }
@@ -3830,6 +3813,23 @@ static int re_attach(device_t dev)
         ifp->if_capenable = ifp->if_capabilities;
         ifp->if_capenable &= ~(IFCAP_WOL_UCAST | IFCAP_WOL_MCAST);
 
+        /* Get station address. */
+        RE_LOCK(sc);
+        re_get_hw_mac_address(sc, eaddr);
+        RE_UNLOCK(sc);
+
+        /*
+         * A RealTek chip was detected. Inform the world.
+         */
+        device_printf(dev,"version:%s\n", RE_VERSION);
+        device_printf(dev,"Ethernet address: %6D\n", eaddr, ":");
+        printf("\nThis product is covered by one or more of the following patents: \
+           \nUS6,570,884, US6,115,776, and US6,327,625.\n");
+
+#if OS_VER < VERSION(6,0)
+        bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);
+#endif
+
         RE_LOCK(sc);
         re_phy_power_up(dev);
         re_hw_phy_config(sc);