diff options
| author | Josh Blum <josh@joshknows.com> | 2011-03-03 11:18:50 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-03-03 11:18:50 -0800 |
| commit | f938ed7938021c10bb0a0ce47e6d40d10f89abc2 (patch) | |
| tree | 0c6793bd4bd8ba0a03ee8d83a0b67e3fe231356c /host/lib/transport | |
| parent | b99c655d2ae52ee14e6430b175fe4849ccc0f0e7 (diff) | |
| parent | 7aed95a658deb52404ba49774cfcecf96df654a8 (diff) | |
| download | uhd-f938ed7938021c10bb0a0ce47e6d40d10f89abc2.tar.gz uhd-f938ed7938021c10bb0a0ce47e6d40d10f89abc2.tar.bz2 uhd-f938ed7938021c10bb0a0ce47e6d40d10f89abc2.zip | |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_impl.cpp
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/udp_zero_copy.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/host/lib/transport/udp_zero_copy.cpp b/host/lib/transport/udp_zero_copy.cpp index dda3bb547..5810f441c 100644 --- a/host/lib/transport/udp_zero_copy.cpp +++ b/host/lib/transport/udp_zero_copy.cpp @@ -196,6 +196,8 @@ public: if (wait_for_recv_ready(_sock_fd, timeout)) return mrb->get_new( ::recv(_sock_fd, mrb->cast<char *>(), _recv_frame_size, 0) ); + + this->handle_recv(mrb); //timeout: return the managed buffer to the queue } return managed_recv_buffer::sptr(); } |