git: ea9ed799ebdf - stable/13 - ifnet: Use NET_EPOCH_WAIT() macro

From: Zhenlei Huang <zlei_at_FreeBSD.org>
Date: Fri, 05 Jul 2024 15:45:22 UTC
The branch stable/13 has been updated by zlei:

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

commit ea9ed799ebdf895e1e029cfffdf8499dc7b36782
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-06-24 09:57:14 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-07-05 15:43:44 +0000

    ifnet: Use NET_EPOCH_WAIT() macro
    
    This makes it easier to grep the usage.
    
    Reviewed by:    kp
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D45715
    
    (cherry picked from commit 71f8fbf9bda43e3ca2f26d0499b7a88d0f2f7352)
    (cherry picked from commit 338bb091008f32fda5cdd8cf9484fa942fa0937c)
---
 sys/net/if.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/net/if.c b/sys/net/if.c
index 4de0cbcb985c..850d1030a16e 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1170,7 +1170,7 @@ if_detach_internal(struct ifnet *ifp, int vmove, struct if_clone **ifcp)
 	 * At this point we know the interface still was on the ifnet list
 	 * and we removed it so we are in a stable state.
 	 */
-	epoch_wait_preempt(net_epoch_preempt);
+	NET_EPOCH_WAIT();
 
 	/*
 	 * Ensure all pending EPOCH(9) callbacks have been executed. This
@@ -1615,7 +1615,7 @@ _if_delgroup_locked(struct ifnet *ifp, struct ifg_list *ifgl,
 	}
 	IFNET_WUNLOCK();
 
-	epoch_wait_preempt(net_epoch_preempt);
+	NET_EPOCH_WAIT();
 	EVENTHANDLER_INVOKE(group_change_event, groupname);
 	if (freeifgl) {
 		EVENTHANDLER_INVOKE(group_detach_event, ifgl->ifgl_group);