Merge branch 'master' into next

Conflicts:
	host/lib/usrp/usrp2/usrp2_regs.cpp

1 files changed, 5 insertions, 1 deletions

diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index b984608ca..8fdd4f953 100644
--- a/host/lib/usrp/dboard/db_dbsrx.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx.cpp
@@ -543,7 +543,7 @@ void dbsrx::rx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_ANTENNA:
-        val = std::string("J3");
+        val = dbsrx_antennas.at(0);
         return;
 
     case SUBDEV_PROP_ANTENNA_NAMES:
@@ -589,6 +589,10 @@ void dbsrx::rx_set(const wax::obj &key_, const wax::obj &val){
         this->set_lo_freq(val.as<double>());
         return;
 
+    case SUBDEV_PROP_ANTENNA:
+        assert_has(dbsrx_antennas, val.as<std::string>(), "DBSRX antenna name");
+        return;
+
     case SUBDEV_PROP_GAIN:
         this->set_gain(val.as<double>(), key.name);
         return;