Merge branch 'master' to rx_features phase 0.5

Signed-off-by: imarom <[email protected]>

diff --cc linux_dpdk/ws_main.py
Simple merge

diff --cc scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
Simple merge

diff --cc scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
index 97c9035,34cafd7..e7f0454
--- 1/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
--- 2/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/utils/parsing_opts.py
@@@ -43,17 -43,8 +43,19 @@@ CORE_MASK = 2
  DUAL = 27
  FLOW_CTRL = 28
  SUPPORTED = 29
- RX_FILTER_MODE = 30
+ FILE_PATH_NO_CHECK = 30
  
 +OUTPUT_FILENAME = 31
 +ALL_FILES = 32
 +LIMIT = 33
 +PORT_RESTART   = 34
 +
 +IPV4 = 35
 +DEST = 36
 +RETRIES = 37
 +
++RX_FILTER_MODE = 38
++
  GLOBAL_STATS = 50
  PORT_STATS = 51
  PORT_STATUS = 52

diff --cc src/main_dpdk.cpp
Simple merge