1 files changed, 13 insertions, 10 deletions

diff --git a/host/lib/usrp/mpmd/mpmd_mb_iface.cpp b/host/lib/usrp/mpmd/mpmd_mb_iface.cpp
index 534d71a4d..a24be5c57 100644
--- a/host/lib/usrp/mpmd/mpmd_mb_iface.cpp
+++ b/host/lib/usrp/mpmd/mpmd_mb_iface.cpp
@@ -176,6 +176,7 @@ uhd::rfnoc::chdr_ctrl_xport::sptr mpmd_mboard_impl::mpmd_mb_iface::make_ctrl_tra
         recv_link, send_link, transport::link_type_t::CTRL);
 
     auto pkt_factory = _link_if_mgr->get_packet_factory(link_idx);
+    auto io_srv_mgr = this->get_io_srv_mgr();
     auto xport       = uhd::rfnoc::chdr_ctrl_xport::make(io_srv,
         send_link,
         recv_link,
@@ -183,8 +184,8 @@ uhd::rfnoc::chdr_ctrl_xport::sptr mpmd_mboard_impl::mpmd_mb_iface::make_ctrl_tra
         local_epid,
         send_link->get_num_send_frames(),
         recv_link->get_num_recv_frames(),
-        [this, send_link, recv_link]() {
-            this->get_io_srv_mgr()->disconnect_links(recv_link, send_link);
+        [io_srv_mgr, send_link, recv_link]() {
+            io_srv_mgr->disconnect_links(recv_link, send_link);
         });
     return xport;
 }
@@ -242,6 +243,7 @@ mpmd_mboard_impl::mpmd_mb_iface::make_rx_data_transport(
 
     // Create the data transport
     auto pkt_factory = _link_if_mgr->get_packet_factory(link_idx);
+    auto io_srv_mgr = this->get_io_srv_mgr();
     auto fc_params   = chdr_rx_data_xport::configure_sep(cfg_io_srv,
         recv_link,
         send_link,
@@ -254,8 +256,8 @@ mpmd_mboard_impl::mpmd_mb_iface::make_rx_data_transport(
         fc_freq,
         fc_headroom,
         lossy_xport,
-        [this, recv_link, send_link]() {
-            this->get_io_srv_mgr()->disconnect_links(recv_link, send_link);
+        [io_srv_mgr, recv_link, send_link]() {
+            io_srv_mgr->disconnect_links(recv_link, send_link);
         });
 
     cfg_io_srv.reset();
@@ -275,8 +277,8 @@ mpmd_mboard_impl::mpmd_mb_iface::make_rx_data_transport(
         epids,
         recv_link->get_num_recv_frames(),
         fc_params,
-        [this, recv_link, send_link]() {
-            this->get_io_srv_mgr()->disconnect_links(recv_link, send_link);
+        [io_srv_mgr, recv_link, send_link]() {
+            io_srv_mgr->disconnect_links(recv_link, send_link);
         });
 
     return rx_xport;
@@ -319,6 +321,7 @@ mpmd_mboard_impl::mpmd_mb_iface::make_tx_data_transport(
         recv_link, send_link, transport::link_type_t::CTRL);
 
     auto pkt_factory         = _link_if_mgr->get_packet_factory(link_idx);
+    auto io_srv_mgr = this->get_io_srv_mgr();
     const auto buff_capacity = chdr_tx_data_xport::configure_sep(cfg_io_srv,
         recv_link,
         send_link,
@@ -329,8 +332,8 @@ mpmd_mboard_impl::mpmd_mb_iface::make_tx_data_transport(
         mdata_buff_fmt,
         fc_freq_ratio,
         fc_headroom_ratio,
-        [this, recv_link, send_link]() {
-            this->get_io_srv_mgr()->disconnect_links(recv_link, send_link);
+        [io_srv_mgr, recv_link, send_link]() {
+            io_srv_mgr->disconnect_links(recv_link, send_link);
         });
 
     cfg_io_srv.reset();
@@ -351,8 +354,8 @@ mpmd_mboard_impl::mpmd_mb_iface::make_tx_data_transport(
         epids,
         send_link->get_num_send_frames(),
         buff_capacity,
-        [this, recv_link, send_link]() {
-            this->get_io_srv_mgr()->disconnect_links(recv_link, send_link);
+        [io_srv_mgr, recv_link, send_link]() {
+            io_srv_mgr->disconnect_links(recv_link, send_link);
         });
 
     return tx_xport;