Merge remote-tracking branch 'origin/n310_uhd_workaround' into integration_2022_wk46

radio/USRP/USERSPACE/LIB/usrp_lib.cpp

@@ -1417,11 +1417,15 @@ extern "C" {
   s->tx_stream = s->usrp->get_tx_stream(stream_args_tx);
 
   /* Setting TX/RX BW after streamers are created due to USRP calibration issue */
-  for(int i=0; i<((int) s->usrp->get_tx_num_channels()) && i<openair0_cfg[0].tx_num_channels; i++)
-    s->usrp->set_tx_bandwidth(openair0_cfg[0].tx_bw,i+choffset);
-
-  for(int i=0; i<((int) s->usrp->get_rx_num_channels()) && i<openair0_cfg[0].rx_num_channels; i++)
-    s->usrp->set_rx_bandwidth(openair0_cfg[0].rx_bw,i+choffset);
+  // N310 with UHD >= 4.2.0 has issues with changing the BW, which is a NOP on N310 in earlier versions
+  // see also: https://github.com/EttusResearch/uhd/issues/644
+  if (device->type != USRP_N300_DEV) {
+    for(int i=0; i<((int) s->usrp->get_tx_num_channels()) && i<openair0_cfg[0].tx_num_channels; i++)
+      s->usrp->set_tx_bandwidth(openair0_cfg[0].tx_bw,i+choffset);
+
+    for(int i=0; i<((int) s->usrp->get_rx_num_channels()) && i<openair0_cfg[0].rx_num_channels; i++)
+      s->usrp->set_rx_bandwidth(openair0_cfg[0].rx_bw,i+choffset);
+  }
 
   for (int i=0; i<openair0_cfg[0].rx_num_channels; i++) {
     LOG_I(HW,"RX Channel %d\n",i);