diff options
| author |   Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
|---|---|---|
| committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-06-23 10:37:04 +0300 |
| commit | f2320939a5deec2db2948788479199931e1f9176 (patch) | |
| tree | fc1b12908503d5b7d67cefe34e0c5fb0f908d2a6 /src/sim/trex_sim_stateless.cpp | |
| parent | 1eed7e59f23d3ab9b957d9822eefe72877e291da (diff) | |
| parent | d04442ab671f768a1b645fb887d4a9cd575c7852 (diff) | |
Merge branch 'master' into cpu_per_core
Conflicts:
scripts/automation/trex_control_plane/server/singleton_daemon.py
Diffstat (limited to 'src/sim/trex_sim_stateless.cpp')
| -rw-r--r-- | src/sim/trex_sim_stateless.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sim/trex_sim_stateless.cpp b/src/sim/trex_sim_stateless.cpp index d3981e97..77bd4d70 100644 --- a/src/sim/trex_sim_stateless.cpp +++ b/src/sim/trex_sim_stateless.cpp @@ -200,7 +200,7 @@ SimStateless::prepare_control_plane() { m_publisher = new SimPublisher(); - TrexRpcServerConfig rpc_req_resp_cfg(TrexRpcServerConfig::RPC_PROT_MOCK, 0, NULL, NULL); + TrexRpcServerConfig rpc_req_resp_cfg(TrexRpcServerConfig::RPC_PROT_MOCK, 0, NULL); cfg.m_port_count = m_port_count; cfg.m_rpc_req_resp_cfg = &rpc_req_resp_cfg; |