2 files changed, 1 insertions, 14 deletions
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
index 625e56eba..578aa9640 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.cpp
@@ -733,7 +733,6 @@ std::string magnesium_radio_ctrl_impl::get_dboard_fe_from_chan(
     return std::to_string(chan);
 }
 
-std::mutex magnesium_radio_ctrl_impl::_set_rpc_lock; // FIXME remove
 
 void magnesium_radio_ctrl_impl::set_rpc_client(
     uhd::rpc_client::sptr rpcc,
@@ -779,15 +778,7 @@ void magnesium_radio_ctrl_impl::set_rpc_client(
     }
     UHD_LOG_DEBUG(unique_id(),
         "Master Clock Rate is: " << (_master_clock_rate / 1e6) << " MHz.");
-    {
-        // FIXME: Remove this lock. It's masking a bug that's probably, but not
-        // confirmed, to be in the receive packet demuxer. It'll pop up when
-        // running UHD over liberio without using serialize_init
-        std::lock_guard<std::mutex> l(magnesium_radio_ctrl_impl::_set_rpc_lock);
-        radio_ctrl_impl::set_rate(_master_clock_rate);
-        // Note: This lock needs to encompass all CHDR traffic. RPC traffic is
-        // OK from a thread-safety perspective.
-    }
+    radio_ctrl_impl::set_rate(_master_clock_rate);
 
     // EEPROM paths subject to change FIXME
     const size_t db_idx = get_block_id().get_block_count();
diff --git a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp
index 48414cd5b..c6fd1bee4 100644
--- a/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp
+++ b/host/lib/usrp/dboard/magnesium/magnesium_radio_ctrl_impl.hpp
@@ -148,10 +148,6 @@ public:
     size_t get_chan_from_dboard_fe(const std::string &fe, const direction_t dir);
     std::string get_dboard_fe_from_chan(const size_t chan, const direction_t dir);
 
-    //! Disable concurrency in set_rpc_client(). This is a workaround for a
-    // thread-unsafety bug and should get deleted at some point in the future!
-    static std::mutex _set_rpc_lock; // FIXME remove this
-
     void set_rpc_client(
         uhd::rpc_client::sptr rpcc,
         const uhd::device_addr_t &block_args