git: 1eb60112b22e - releng/13.0 - Use iflib_if_init_locked() during media change instead of iflib_init_locked().

Allan Jude allanjude at FreeBSD.org
Thu Feb 25 20:41:27 UTC 2021


The branch releng/13.0 has been updated by allanjude:

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

commit 1eb60112b22ea0d61f0d1ba4ac0cca56a0c034c8
Author:     Allan Jude <allanjude at FreeBSD.org>
AuthorDate: 2021-02-14 18:39:09 +0000
Commit:     Allan Jude <allanjude at FreeBSD.org>
CommitDate: 2021-02-25 20:41:10 +0000

    Use iflib_if_init_locked() during media change instead of iflib_init_locked().
    
    iflib_init_locked() assumes that iflib_stop() has been called, however,
    it is not called for media changes.
    iflib_if_init_locked() calls stop then init, so fixes the problem.
    
    PR:     253473
    Sponsored by:   Juniper Networks, Inc., Klara, Inc.
    Approved by:    re (gjb)
    
    (cherry picked from commit 922cf8ac43adc9983f9a9e05cfd838306c1ef483)
---
 sys/net/iflib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/net/iflib.c b/sys/net/iflib.c
index d10c11f865fe..506861b65570 100644
--- a/sys/net/iflib.c
+++ b/sys/net/iflib.c
@@ -2503,7 +2503,7 @@ iflib_media_change(if_t ifp)
 
 	CTX_LOCK(ctx);
 	if ((err = IFDI_MEDIA_CHANGE(ctx)) == 0)
-		iflib_init_locked(ctx);
+		iflib_if_init_locked(ctx);
 	CTX_UNLOCK(ctx);
 	return (err);
 }


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