Merge branch 'master' into rpc

Conflicts:
	scripts/automation/trex_control_plane/client_utils/jsonrpc_client.py

1 files changed, 4 insertions, 5 deletions

diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index a748178d..820fb3fa 100755
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -4115,11 +4115,10 @@ int CGlobalPortCfg::start_send_master(){
 
     CTupleGenYamlInfo * tg=&m_fl.m_yaml_info.m_tuple_gen;
 
-    m_mg.set_ip( tg->m_clients_ip_start,
-                 tg->m_servers_ip_start,
-                 tg->m_dual_interface_mask
-                  );
-
+    m_mg.set_ip( tg->m_client_pool[0].get_ip_start(),
+                 tg->m_server_pool[0].get_ip_start(),
+                 tg->m_client_pool[0].getDualMask()
+               );
 
     if (  CGlobalInfo::m_options.preview.getVMode() >0 ) {
       m_fl.DumpCsv(stdout);