summaryrefslogtreecommitdiff
path: root/usrp2/host/lib
diff options
context:
space:
mode:
Diffstat (limited to 'usrp2/host/lib')
-rw-r--r--usrp2/host/lib/usrp2.cc4
-rw-r--r--usrp2/host/lib/usrp2_impl.cc2
-rw-r--r--usrp2/host/lib/usrp2_impl.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/usrp2/host/lib/usrp2.cc b/usrp2/host/lib/usrp2.cc
index ab64cb6cd..2e8540e91 100644
--- a/usrp2/host/lib/usrp2.cc
+++ b/usrp2/host/lib/usrp2.cc
@@ -161,9 +161,9 @@ namespace usrp2 {
}
std::string
- usrp2::ifc_name()
+ usrp2::interface_name()
{
- return d_impl->ifc_name();
+ return d_impl->interface_name();
}
// Receive
diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/host/lib/usrp2_impl.cc
index 3a0cd918e..a0d340c91 100644
--- a/usrp2/host/lib/usrp2_impl.cc
+++ b/usrp2/host/lib/usrp2_impl.cc
@@ -129,7 +129,7 @@ namespace usrp2 {
usrp2::impl::impl(const std::string &ifc, props *p)
- : d_eth_buf(new eth_buffer()), d_ifc_name(ifc), d_pf(0), d_bg_thread(0),
+ : d_eth_buf(new eth_buffer()), d_interface_name(ifc), d_pf(0), d_bg_thread(0),
d_bg_running(false), d_rx_seqno(-1), d_tx_seqno(0), d_next_rid(0),
d_num_rx_frames(0), d_num_rx_missing(0), d_num_rx_overruns(0), d_num_rx_bytes(0),
d_num_enqueued(0), d_enqueued_mutex(), d_bg_pending_cond(&d_enqueued_mutex),
diff --git a/usrp2/host/lib/usrp2_impl.h b/usrp2/host/lib/usrp2_impl.h
index 8928751b3..c36a6d3c5 100644
--- a/usrp2/host/lib/usrp2_impl.h
+++ b/usrp2/host/lib/usrp2_impl.h
@@ -57,7 +57,7 @@ namespace usrp2 {
static const size_t NCHANS = 32;
eth_buffer *d_eth_buf;
- std::string d_ifc_name;
+ std::string d_interface_name;
pktfilter *d_pf;
std::string d_addr; // FIXME: use u2_mac_addr_t instead
usrp2_thread *d_bg_thread;
@@ -118,7 +118,7 @@ namespace usrp2 {
void bg_loop();
std::string mac_addr() const { return d_addr; } // FIXME: convert from u2_mac_addr_t
- std::string ifc_name() const { return d_ifc_name; }
+ std::string interface_name() const { return d_interface_name; }
// Rx