diff options
| author |   imarom <imarom@cisco.com> | 2015-11-19 12:49:10 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2015-11-19 12:49:10 +0200 |
| commit | 76248b13906f575f709ed2270d63ec41131f4bdf (patch) | |
| tree | 6b5313815b6181aed313ea6fc58b6ec311d554ea /linux_dpdk | |
| parent | a7317d45787669af71ca8c65fd1e51f8a47d2c1e (diff) | |
| parent | 91a4e6cc117076d3f5d34437581f7ffe91e6892b (diff) | |
Merge branch 'master' of csi-sceasr-b45:/auto/proj-pcube-b/apps/PL-b/tools/repo//trex-core
Conflicts:
src/stateless/cp/trex_streams_compiler.h
src/stateless/dp/trex_stateless_dp_core.cpp
src/stateless/dp/trex_stateless_dp_core.h
src/stateless/messaging/trex_stateless_messaging.cpp
src/stateless/messaging/trex_stateless_messaging.h
Diffstat (limited to 'linux_dpdk')
| -rwxr-xr-x | linux_dpdk/ws_main.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index b7a9c746..f7acd49d 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -108,7 +108,6 @@ main_src = SrcGroup(dir='src', 'nat_check.cpp', 'msg_manager.cpp', 'publisher/trex_publisher.cpp', - 'trex_dp_port_events.cpp', 'pal/linux_dpdk/pal_utl.cpp', 'pal/linux_dpdk/mbuf.cpp' ]); @@ -161,6 +160,7 @@ stateless_src = SrcGroup(dir='src/stateless/', 'cp/trex_stateless.cpp', 'cp/trex_stateless_port.cpp', 'cp/trex_streams_compiler.cpp', + 'cp/trex_dp_port_events.cpp', 'dp/trex_stateless_dp_core.cpp', 'messaging/trex_stateless_messaging.cpp' ]) |