diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-07-17 17:59:44 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-07-17 17:59:44 -0700 |
| commit | bd2de9c6ccb48ef9fd18a9a4c431b1cae90c1032 (patch) | |
| tree | b9b351a42312752cbc92bced335665b4f18d9a60 /host/lib/usrp/x300/x300_impl.cpp | |
| parent | d99ce4ef99240778ec4d44f858d83b8af153cdf9 (diff) | |
| parent | 1af6628eb1edf29dffae771b8f3ada6952a50b69 (diff) | |
| download | uhd-bd2de9c6ccb48ef9fd18a9a4c431b1cae90c1032.tar.gz uhd-bd2de9c6ccb48ef9fd18a9a4c431b1cae90c1032.tar.bz2 uhd-bd2de9c6ccb48ef9fd18a9a4c431b1cae90c1032.zip | |
Merge remote-tracking branch 'origin/maint'
Diffstat (limited to 'host/lib/usrp/x300/x300_impl.cpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index 2c291f422..a624ebf6b 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -1129,12 +1129,12 @@ x300_impl::both_xports_t x300_impl::make_transport( if (mb.xport_path == "nirio") { default_buff_args.send_frame_size = (prefix == X300_RADIO_DEST_PREFIX_TX) - ? X300_PCIE_DATA_FRAME_SIZE + ? X300_PCIE_TX_DATA_FRAME_SIZE : X300_PCIE_MSG_FRAME_SIZE; default_buff_args.recv_frame_size = (prefix == X300_RADIO_DEST_PREFIX_RX) - ? X300_PCIE_DATA_FRAME_SIZE + ? X300_PCIE_RX_DATA_FRAME_SIZE : X300_PCIE_MSG_FRAME_SIZE; default_buff_args.num_send_frames = |