aboutsummaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorSugandha Gupta <sugandha.gupta@ettus.com>2019-08-06 14:16:13 -0700
committerBrent Stapleton <brent.stapleton@ettus.com>2019-08-07 10:51:42 -0700
commitd65a22434cad03c464fa5dbf0c53646307b074ea (patch)
tree279faf20369c8bc6c1af5a34c4497fdce664bcb5 /host
parentc6eb38369729d7ff32046a11533d15201c3e58fe (diff)
downloaduhd-d65a22434cad03c464fa5dbf0c53646307b074ea.tar.gz
uhd-d65a22434cad03c464fa5dbf0c53646307b074ea.tar.bz2
uhd-d65a22434cad03c464fa5dbf0c53646307b074ea.zip
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".
Diffstat (limited to 'host')
-rw-r--r--host/lib/usrp/mpmd/mpmd_mboard_impl.cpp2
1 files changed, 1 insertions, 1 deletions
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<device_addr_t> 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<device_addr_t>();
+ continue;
} else {
UHD_LOG_TRACE("MPMD",
boost::format("Reachable device matches expected device (serial=%s)")