diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c
--- a/sys/netlink/netlink_domain.c
+++ b/sys/netlink/netlink_domain.c
@@ -486,7 +486,7 @@
 	NL_LOG(LOG_DEBUG3, "socket %p, detached", so);
 
 	/* XXX: is delayed free needed? */
-	epoch_call(net_epoch_preempt, destroy_nlpcb_epoch, &nlp->nl_epoch_ctx);
+	NET_EPOCH_CALL(destroy_nlpcb_epoch, &nlp->nl_epoch_ctx);
 }
 
 static int
diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c
--- a/sys/netlink/netlink_generic.c
+++ b/sys/netlink/netlink_generic.c
@@ -513,6 +513,6 @@
 {
 	genl_nlctrl_destroy();
 	GENL_LOCK_DESTROY();
-	epoch_wait_preempt(net_epoch_preempt);
+	NET_EPOCH_WAIT();
 }
 SYSUNINIT(genl_unload, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, genl_unload, NULL);
diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c
--- a/sys/netlink/netlink_route.c
+++ b/sys/netlink/netlink_route.c
@@ -134,6 +134,6 @@
 	rtnl_neighs_destroy();
 
 	/* Wait till all consumers read nlbridge data */
-	epoch_wait_preempt(net_epoch_preempt);
+	NET_EPOCH_WAIT();
 }
 SYSUNINIT(rtnl_unload, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, rtnl_unload, NULL);
diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c
--- a/sys/netlink/route/nexthop.c
+++ b/sys/netlink/route/nexthop.c
@@ -553,8 +553,7 @@
 
 	while (unhop_base != NULL) {
 		unhop_chain = unhop_base->un_nextchild;
-		epoch_call(net_epoch_preempt, destroy_unhop_epoch,
-		    &unhop_base->un_epoch_ctx);
+		NET_EPOCH_CALL(destroy_unhop_epoch, &unhop_base->un_epoch_ctx);
 		unhop_base = unhop_chain;
 	}
 
@@ -632,7 +631,7 @@
 	V_un_ctl = NULL;
 
 	/* Wait till all unhop users finish their reads */
-	epoch_wait_preempt(net_epoch_preempt);
+	NET_EPOCH_WAIT();
 
 	UN_WLOCK(ctl);
 	CHT_SLIST_FOREACH_SAFE(&ctl->un_head, unhop, unhop, tmp) {