From 7c9861cd09fcbd4d0360acf9b64441c346c4ba12 Mon Sep 17 00:00:00 2001 From: Yaroslav Brustinov Date: Thu, 2 Feb 2017 14:01:02 +0200 Subject: remove code inserted by incorrect merge resolve Change-Id: Ic2c4e8ce8cd5eed8bea230603838dd66f05ef4ea Signed-off-by: Yaroslav Brustinov --- .../trex_control_plane/stl/trex_stl_lib/trex_stl_client.py | 2 -- src/stateless/cp/trex_stateless_port.h | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py index 46ab668e..edffc5d0 100755 --- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py +++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py @@ -4004,8 +4004,6 @@ class STLClient(object): opts = parser.parse_args(line.split(), default_ports = self.get_acquired_ports()) if not opts: return opts - print(opts) - print(parsing_opts.ON_OFF_DICT) opts.prom = parsing_opts.ON_OFF_DICT.get(opts.prom) opts.mult = parsing_opts.ON_OFF_DICT.get(opts.mult) diff --git a/src/stateless/cp/trex_stateless_port.h b/src/stateless/cp/trex_stateless_port.h index 296e0d05..5c2c8397 100644 --- a/src/stateless/cp/trex_stateless_port.h +++ b/src/stateless/cp/trex_stateless_port.h @@ -390,19 +390,6 @@ public: void get_hw_mac(std::string &hw_mac); - - /** - * enable RX capture on port - * - */ - void start_rx_capture(const std::string &pcap_filename, uint64_t limit); - - /** - * disable RX capture if on - * - */ - void stop_rx_capture(); - /** * start RX queueing of packets * -- cgit 1.2.3-korg