From d65a22434cad03c464fa5dbf0c53646307b074ea Mon Sep 17 00:00:00 2001 From: Sugandha Gupta Date: Tue, 6 Aug 2019 14:16:13 -0700 Subject: mpmd: Fix corner case in MPM device reachability To check if a device is fully reachable through the chdr address i.e. SFP port, an RPC request is sent to "second_addr" and "addr" of that device. This commit fixes the case where if "second_addr" is not connected to the host, the function returns earlier and does not check for "addr". --- host/lib/usrp/mpmd/mpmd_mboard_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp b/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp index 8bf8d6826..d63b64d66 100644 --- a/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp +++ b/host/lib/usrp/mpmd/mpmd_mboard_impl.cpp @@ -230,7 +230,7 @@ boost::optional mpmd_mboard_impl::is_device_reachable( boost::format("Connected to CHDR interface, but got wrong device. " "Tried to reach serial %s, got %s") % device_info_dict["serial"] % dev_info_chdr["serial"]); - return boost::optional(); + continue; } else { UHD_LOG_TRACE("MPMD", boost::format("Reachable device matches expected device (serial=%s)") -- cgit v1.2.3