diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-10-07 16:44:49 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-10-07 16:44:49 -0700 |
| commit | 1b70b3e70df40aae4d1e53037212d77af2fdc4e4 (patch) | |
| tree | dcde2a418b7cfb4672e5ef5e57bbf85ae3c2d4b1 /host/lib/usrp/multi_usrp.cpp | |
| parent | 811444b126ed40aed115af4464422122afd0c607 (diff) | |
| parent | 006c321c552781501bcb0cff9e156c991c24ce45 (diff) | |
| download | uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.tar.gz uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.tar.bz2 uhd-1b70b3e70df40aae4d1e53037212d77af2fdc4e4.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/multi_usrp.cpp')
| -rw-r--r-- | host/lib/usrp/multi_usrp.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 7905a6d32..52dfa5773 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -1877,6 +1877,7 @@ private: //! \param is_tx True for tx // Assumption is that all mboards use the same link + // and that the rate sum is evenly distributed among the mboards bool _check_link_rate(const stream_args_t &args, bool is_tx) { bool link_rate_is_ok = true; size_t bytes_per_sample = convert::get_bytes_per_item(args.otw_format.empty() ? "sc16" : args.otw_format); @@ -1892,6 +1893,7 @@ private: } sum_rate += is_tx ? get_tx_rate(chan) : get_rx_rate(chan); } + sum_rate /= get_num_mboards(); if (max_link_rate > 0 and (max_link_rate / bytes_per_sample) < sum_rate) { UHD_MSG(warning) << boost::format( "The total sum of rates (%f MSps on %u channels) exceeds the maximum capacity of the connection.\n" |