summaryrefslogtreecommitdiffstats
path: root/host/examples
diff options
context:
space:
mode:
authorNick Foster <nick@nerdnetworks.org>2010-07-27 16:10:36 -0700
committerNick Foster <nick@nerdnetworks.org>2010-07-27 16:15:51 -0700
commitaeedd5a53e017e2c14a86dff521353ff6016a849 (patch)
treec32cae63a6c7524210a6f859f0258b7ed1846622 /host/examples
parentd8f3980e45458cf68c8efaa029e492a1b8d08354 (diff)
parentbbe7dd1c8f1bd8f42a0ae3d28f36c0334b0fd3c8 (diff)
downloaduhd-aeedd5a53e017e2c14a86dff521353ff6016a849.tar.gz
uhd-aeedd5a53e017e2c14a86dff521353ff6016a849.tar.bz2
uhd-aeedd5a53e017e2c14a86dff521353ff6016a849.zip
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2px
Conflicts: host/lib/usrp/usrp2/mboard_impl.cpp
Diffstat (limited to 'host/examples')
-rw-r--r--host/examples/benchmark_rx_rate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/examples/benchmark_rx_rate.cpp b/host/examples/benchmark_rx_rate.cpp
index 752facb0d..8fae813cf 100644
--- a/host/examples/benchmark_rx_rate.cpp
+++ b/host/examples/benchmark_rx_rate.cpp
@@ -66,7 +66,7 @@ static inline void test_device(
//handle the error codes
switch(md.error_code){
case uhd::rx_metadata_t::ERROR_CODE_NONE:
- case uhd::rx_metadata_t::ERROR_CODE_OVERRUN:
+ case uhd::rx_metadata_t::ERROR_CODE_OVERFLOW:
break;
default: