From 0837c4e2a3e878f8c45aa723f7d468839f4ba256 Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 9 Aug 2016 17:48:58 -0700
Subject: x300: Device propagates suggested TX MTU through the mtu property,
not get_tx_hints()
---
host/lib/usrp/x300/x300_impl.cpp | 2 +-
host/lib/usrp/x300/x300_io_impl.cpp | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
(limited to 'host/lib/usrp')
diff --git a/host/lib/usrp/x300/x300_impl.cpp b/host/lib/usrp/x300/x300_impl.cpp
index ee0baa2a3..43ccd26f5 100644
--- a/host/lib/usrp/x300/x300_impl.cpp
+++ b/host/lib/usrp/x300/x300_impl.cpp
@@ -648,7 +648,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(_max_frame_sizes.send_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<double>(mb_path / "link_max_rate").set(X300_MAX_RATE_10GIGE);
}
diff --git a/host/lib/usrp/x300/x300_io_impl.cpp b/host/lib/usrp/x300/x300_io_impl.cpp
index 5314d1b9a..614a98590 100644
--- a/host/lib/usrp/x300/x300_io_impl.cpp
+++ b/host/lib/usrp/x300/x300_io_impl.cpp
@@ -64,9 +64,6 @@ device_addr_t x300_impl::get_rx_hints(size_t mb_index)
device_addr_t x300_impl::get_tx_hints(size_t mb_index)
{
device_addr_t tx_hints = _mb[mb_index].send_args;
- if (_mb[mb_index].xport_path != "nirio") {
- tx_hints["bpp"] = boost::lexical_cast<std::string>(X300_1GE_DATA_FRAME_MAX_SIZE);
- }
return tx_hints;
}
--
cgit v1.2.3