diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-18 17:04:08 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-18 17:04:08 -0700 |
| commit | 5bf9e60baf7b85db3da0d41b97d9fe4e9b3e64bd (patch) | |
| tree | 22c645a5a760befe308f8d869c3a398551d960f0 /host/lib | |
| parent | a2abd6bc615cb63e585e7fafa9ea8491bb25f5b5 (diff) | |
| parent | 816a07bee54e998e4fb25beeb44b9ac3888189bf (diff) | |
| download | uhd-5bf9e60baf7b85db3da0d41b97d9fe4e9b3e64bd.tar.gz uhd-5bf9e60baf7b85db3da0d41b97d9fe4e9b3e64bd.tar.bz2 uhd-5bf9e60baf7b85db3da0d41b97d9fe4e9b3e64bd.zip | |
Merge branch 'master' into flow_ctrl
Conflicts:
host/lib/usrp/usrp2/io_impl.cpp
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index 95a627266..f25b73f80 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -112,7 +112,7 @@ struct usrp2_impl::io_impl{ io_impl(size_t num_recv_frames, size_t send_frame_size, size_t width): packet_handler_recv_state(width), - recv_pirate_booty(alignment_buffer_type::make(num_recv_frames, width)), + recv_pirate_booty(alignment_buffer_type::make(num_recv_frames-3, width)), async_msg_fifo(bounded_buffer<async_metadata_t>::make(100/*messages deep*/)) { for (size_t i = 0; i < width; i++) fc_mons.push_back( |