git: 8b889b895382 - main - mgb: Do not KASSERT on error in mgb_init

Ed Maste emaste at FreeBSD.org
Tue Sep 28 17:58:23 UTC 2021


The branch main has been updated by emaste:

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

commit 8b889b8953828fe22e5de68647a35610dd87ff8f
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-09-28 17:48:49 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-09-28 17:57:36 +0000

    mgb: Do not KASSERT on error in mgb_init
    
    There's not much we can do if mii_mediachg() fails, but KASSERT is not
    appropriate.
    
    MFC after:      1 week
    Fixes:          8890ab7758b8 ("Introduce if_mgb driver...")
    Sponsored by:   The FreeBSD Foundation
---
 sys/dev/mgb/if_mgb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c
index 472de84c13b1..de4f78e0fd57 100644
--- a/sys/dev/mgb/if_mgb.c
+++ b/sys/dev/mgb/if_mgb.c
@@ -615,7 +615,10 @@ mgb_init(if_ctx_t ctx)
 	    MGB_RFE_ALLOW_UNICAST);
 
 	error = mii_mediachg(miid);
-	KASSERT(!error, ("mii_mediachg returned: %d", error));
+	/* Not much we can do if this fails. */
+	if (error)
+		device_printf(sc->dev, "%s: mii_mediachg returned %d", __func__,
+		    error);
 }
 
 #ifdef DEBUG


More information about the dev-commits-src-all mailing list