diff options
| author | Josh Blum <josh@joshknows.com> | 2012-04-17 14:11:51 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-04-17 14:11:51 -0700 |
| commit | 09df4536a909ef008ff5315799ea624e463dcf97 (patch) | |
| tree | a7c3fafeeb63fa3a3003c26f876fa50d0a9fad0f | |
| parent | 1c61865d1a1c4bd385e790abe3eaa5acb174a5e9 (diff) | |
| parent | 4a1ec80d496e7754cf5a8c0f96322b2871094a31 (diff) | |
| download | uhd-09df4536a909ef008ff5315799ea624e463dcf97.tar.gz uhd-09df4536a909ef008ff5315799ea624e463dcf97.tar.bz2 uhd-09df4536a909ef008ff5315799ea624e463dcf97.zip | |
Merge branch 'maint'
| -rw-r--r-- | host/lib/transport/super_recv_packet_handler.hpp | 2 | ||||
| -rw-r--r-- | host/lib/transport/usb_zero_copy_wrapper.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp index 74fbe82fb..205c7a3a3 100644 --- a/host/lib/transport/super_recv_packet_handler.hpp +++ b/host/lib/transport/super_recv_packet_handler.hpp @@ -306,7 +306,7 @@ private: #endif //3) check for out of order timestamps - if (info.ifpi.has_tsi and info.ifpi.has_tsf and prev_buffer_info[index].time > info.time){ + if (info.ifpi.has_tsf and prev_buffer_info[index].time > info.time){ return PACKET_TIMESTAMP_ERROR; } diff --git a/host/lib/transport/usb_zero_copy_wrapper.cpp b/host/lib/transport/usb_zero_copy_wrapper.cpp index 690e5aaa2..3571ed856 100644 --- a/host/lib/transport/usb_zero_copy_wrapper.cpp +++ b/host/lib/transport/usb_zero_copy_wrapper.cpp @@ -35,10 +35,9 @@ public: _queue(queue){/*NOP*/} void release(void){ - if (_mrb.get() == NULL) return; - _mrb->release(); + if (not _mrb) return; + _mrb.reset(); //decrement ref count, other MRB's may hold a ref _queue.push_with_haste(this); - _mrb.reset(); } UHD_INLINE sptr get_new(managed_recv_buffer::sptr mrb, const void *mem, size_t len){ |