Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e

2 files changed, 12 insertions, 1 deletions

diff --git a/host/include/uhd/transport/udp_zero_copy.hpp b/host/include/uhd/transport/udp_zero_copy.hpp
index fd1cec46e..525606a9f 100644
--- a/host/include/uhd/transport/udp_zero_copy.hpp
+++ b/host/include/uhd/transport/udp_zero_copy.hpp
@@ -50,8 +50,15 @@ public:
      *
      * \param addr a string representing the destination address
      * \param port a string representing the destination port
+     * \param recv_buff_size size in bytes for the recv buffer, 0 for automatic
+     * \param send_buff_size size in bytes for the send buffer, 0 for automatic
      */
-    static sptr make(const std::string &addr, const std::string &port);
+    static sptr make(
+        const std::string &addr,
+        const std::string &port,
+        size_t recv_buff_size = 0,
+        size_t send_buff_size = 0
+    );
 };
 
 }} //namespace
diff --git a/host/include/uhd/usrp/usrp2.hpp b/host/include/uhd/usrp/usrp2.hpp
index 613b40ae3..7387e5dd4 100644
--- a/host/include/uhd/usrp/usrp2.hpp
+++ b/host/include/uhd/usrp/usrp2.hpp
@@ -35,6 +35,10 @@ public:
      * hint["addr"] = address, where address is a resolvable address
      * or ip address, which may or may not be a broadcast address.
      *
+     * Other optional device address keys:
+     *   recv_buff_size: resizes the recv buffer on the data socket
+     *   send_buff_size: resizes the send buffer on the data socket
+     *
      * \param hint a device addr with the usrp2 address filled in
      * \return a vector of device addresses for all usrp2s found
      */