8 files changed, 16 insertions, 18 deletions
diff --git a/src/rpc-server/commands/trex_rpc_cmd_general.cpp b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
index 3653de1a..b63c2faa 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_general.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_general.cpp
@@ -765,14 +765,14 @@ TrexRpcCmdSetRxFeature::parse_server_msg(const Json::Value &msg, TrexStatelessPo
 
 
 trex_rpc_cmd_rc_e
-TrexRpcCmdGetRxSwPkts::_run(const Json::Value &params, Json::Value &result) {
+TrexRpcCmdGetRxQueuePkts::_run(const Json::Value &params, Json::Value &result) {
     
     uint8_t port_id = parse_port(params, result);
 
     TrexStatelessPort *port = get_stateless_obj()->get_port_by_id(port_id);
 
     try {
-        RxPacketBuffer *pkt_buffer = port->get_rx_sw_pkts();
+        RxPacketBuffer *pkt_buffer = port->get_rx_queue_pkts();
         result["result"]["pkts"] = pkt_buffer->to_json();
 
     } catch (const TrexException &ex) {
diff --git a/src/rpc-server/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h
index 26de717f..b8a5d323 100644
--- a/src/rpc-server/commands/trex_rpc_cmds.h
+++ b/src/rpc-server/commands/trex_rpc_cmds.h
@@ -158,7 +158,7 @@ TREX_RPC_CMD_DEFINE_EXTENDED(TrexRpcCmdSetRxFeature, "set_rx_feature", 3, false,
 
 );
 
-TREX_RPC_CMD_DEFINE(TrexRpcCmdGetRxSwPkts, "get_rx_sw_pkts", 2, false, APIClass::API_CLASS_TYPE_CORE);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdGetRxQueuePkts, "get_rx_queue_pkts", 2, false, APIClass::API_CLASS_TYPE_CORE);
 
 #endif /* __TREX_RPC_CMD_H__ */
 
diff --git a/src/rpc-server/trex_rpc_cmds_table.cpp b/src/rpc-server/trex_rpc_cmds_table.cpp
index 45e32d4a..f006a4cd 100644
--- a/src/rpc-server/trex_rpc_cmds_table.cpp
+++ b/src/rpc-server/trex_rpc_cmds_table.cpp
@@ -73,7 +73,7 @@ TrexRpcCommandsTable::TrexRpcCommandsTable() {
     register_command(new TrexRpcCmdShutdown());
 
     register_command(new TrexRpcCmdSetRxFeature());
-    register_command(new TrexRpcCmdGetRxSwPkts());
+    register_command(new TrexRpcCmdGetRxQueuePkts());
 }
 
 
diff --git a/src/stateless/cp/trex_stateless_port.cpp b/src/stateless/cp/trex_stateless_port.cpp
index 691185cd..ff83087c 100644
--- a/src/stateless/cp/trex_stateless_port.cpp
+++ b/src/stateless/cp/trex_stateless_port.cpp
@@ -978,12 +978,12 @@ TrexStatelessPort::stop_rx_queue() {
 
 
 RxPacketBuffer *
-TrexStatelessPort::get_rx_sw_pkts() {
+TrexStatelessPort::get_rx_queue_pkts() {
 
     /* ask RX core for the pkt queue */
     TrexStatelessMsgReply<RxPacketBuffer *> msg_reply;
 
-    TrexStatelessCpToRxMsgBase *msg = new TrexStatelessRxSwGetPkts(m_port_id, msg_reply);
+    TrexStatelessCpToRxMsgBase *msg = new TrexStatelessRxQueueGetPkts(m_port_id, msg_reply);
     send_message_to_rx(msg);
 
     RxPacketBuffer *pkt_buffer = msg_reply.wait_for_reply();
diff --git a/src/stateless/cp/trex_stateless_port.h b/src/stateless/cp/trex_stateless_port.h
index 36f17659..d71ba932 100644
--- a/src/stateless/cp/trex_stateless_port.h
+++ b/src/stateless/cp/trex_stateless_port.h
@@ -408,10 +408,10 @@ public:
     }
 
     /**
-     * fetch the RX software packets from the queue
+     * fetch the RX queue packets from the queue
      * 
      */
-    RxPacketBuffer *get_rx_sw_pkts();
+    RxPacketBuffer *get_rx_queue_pkts();
 
 private:
 
diff --git a/src/stateless/messaging/trex_stateless_messaging.cpp b/src/stateless/messaging/trex_stateless_messaging.cpp
index 95168c4d..c2182f3c 100644
--- a/src/stateless/messaging/trex_stateless_messaging.cpp
+++ b/src/stateless/messaging/trex_stateless_messaging.cpp
@@ -257,11 +257,6 @@ bool TrexStatelessRxQuit::handle (CRxCoreStateless *rx_core) {
 }
 
 
-TrexStatelessRxSwGetPkts::TrexStatelessRxSwGetPkts(uint8_t port_id, TrexStatelessMsgReply<RxPacketBuffer *> &reply) :  m_reply(reply) {
-    m_port_id = port_id;
-}
-
-
 bool
 TrexStatelessRxStartCapture::handle(CRxCoreStateless *rx_core) {
     rx_core->start_capture(m_port_id, m_pcap_filename, m_limit, m_shared_counter);
@@ -291,8 +286,9 @@ TrexStatelessRxStopQueue::handle(CRxCoreStateless *rx_core) {
 }
 
 
-bool TrexStatelessRxSwGetPkts::handle(CRxCoreStateless *rx_core) {
-    RxPacketBuffer *pkt_buffer = rx_core->get_rx_sw_pkt_buffer(m_port_id);
+
+bool TrexStatelessRxQueueGetPkts::handle(CRxCoreStateless *rx_core) {
+    RxPacketBuffer *pkt_buffer = rx_core->get_rx_queue_pkts(m_port_id);
     assert(pkt_buffer);
     m_reply.set(pkt_buffer);
 
diff --git a/src/stateless/messaging/trex_stateless_messaging.h b/src/stateless/messaging/trex_stateless_messaging.h
index b598a6d6..52b1662e 100644
--- a/src/stateless/messaging/trex_stateless_messaging.h
+++ b/src/stateless/messaging/trex_stateless_messaging.h
@@ -521,10 +521,12 @@ private:
 
 
 
-class TrexStatelessRxSwGetPkts : public TrexStatelessCpToRxMsgBase {
+class TrexStatelessRxQueueGetPkts : public TrexStatelessCpToRxMsgBase {
 public:
 
-    TrexStatelessRxSwGetPkts(uint8_t port_id, TrexStatelessMsgReply<RxPacketBuffer *> &reply);
+    TrexStatelessRxQueueGetPkts(uint8_t port_id, TrexStatelessMsgReply<RxPacketBuffer *> &reply) : m_reply(reply) {
+        m_port_id = port_id;
+    }
 
     /**
      * virtual function to handle a message
diff --git a/src/stateless/rx/trex_stateless_rx_core.h b/src/stateless/rx/trex_stateless_rx_core.h
index b5844583..519724d8 100644
--- a/src/stateless/rx/trex_stateless_rx_core.h
+++ b/src/stateless/rx/trex_stateless_rx_core.h
@@ -111,7 +111,7 @@ class CRxCoreStateless {
     double get_cpu_util();
     void update_cpu_util();
 
-    RxPacketBuffer *get_rx_sw_pkt_buffer(uint8_t port_id) {
+    RxPacketBuffer *get_rx_queue_pkts(uint8_t port_id) {
         return m_rx_port_mngr[port_id].get_pkt_buffer();
     }