diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-12-13 10:43:45 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-12-13 10:43:53 -0800 |
| commit | 582553984cfd70ae11f5c12da568e4a0a74888d2 (patch) | |
| tree | 2712e0e6c8c4a5c9f25fb69b8a7831cf88d995af | |
| parent | 289dd9446285ab3a04e8e26370159a050f6c5e09 (diff) | |
| download | uhd-582553984cfd70ae11f5c12da568e4a0a74888d2.tar.gz uhd-582553984cfd70ae11f5c12da568e4a0a74888d2.tar.bz2 uhd-582553984cfd70ae11f5c12da568e4a0a74888d2.zip | |
x300: Made MTU throttling more explicit in x300 header files
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp index fffd6ecac..50a7f3ded 100644 --- a/host/lib/usrp/x300/x300_impl.cpp +++ b/host/lib/usrp/x300/x300_impl.cpp @@ -652,7 +652,7 @@ void x300_impl::setup_mb(const size_t mb_i, const uhd::device_addr_t &dev_addr) } _tree->create<size_t>(mb_path / "mtu/recv").set(_max_frame_sizes.recv_frame_size); - _tree->create<size_t>(mb_path / "mtu/send").set(std::min(_max_frame_sizes.send_frame_size, X300_1GE_DATA_FRAME_MAX_SIZE)); + _tree->create<size_t>(mb_path / "mtu/send").set(std::min(_max_frame_sizes.send_frame_size, X300_ETH_DATA_FRAME_MAX_TX_SIZE)); _tree->create<double>(mb_path / "link_max_rate").set(X300_MAX_RATE_10GIGE); } diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index db5396008..e292e2d68 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -67,6 +67,8 @@ static const size_t X300_PCIE_MAX_MUXED_XPORTS = 32; static const size_t X300_10GE_DATA_FRAME_MAX_SIZE = 8000; // CHDR packet size in bytes static const size_t X300_1GE_DATA_FRAME_MAX_SIZE = 1472; // CHDR packet size in bytes static const size_t X300_ETH_MSG_FRAME_SIZE = uhd::transport::udp_simple::mtu; //bytes +// MTU throttling for ethernet/TX (see above): +static const size_t X300_ETH_DATA_FRAME_MAX_TX_SIZE = 2000; static const double X300_THREAD_BUFFER_TIMEOUT = 0.1; // Time in seconds |