diff options
| author |   imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
|---|---|---|
| committer | imarom <imarom@cisco.com> | 2017-01-22 16:20:45 +0200 |
| commit | 904eacd9be1230efb7ae0ab7997ec131b588ec8a (patch) | |
| tree | 8e4bcd1b1a5f683efdb8f3eeb962acefc3201961 /linux_dpdk | |
| parent | d2f1c8451e2e8ffc47b208f68f9b16697d706d60 (diff) | |
| parent | b81cdb6c2d6d118c1c346e7c8dae6a5e747d867d (diff) | |
Merge branch 'master' into capture
Signed-off-by: imarom <imarom@cisco.com>
Conflicts:
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_port.py
src/main_dpdk.cpp
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 0d9833d1..4273dfe7 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -434,7 +434,7 @@ dpdk_src = SrcGroup(dir='src/dpdk/', 'drivers/net/i40e/base/i40e_hmc.c', 'drivers/net/i40e/base/i40e_lan_hmc.c', 'drivers/net/i40e/base/i40e_nvm.c', -# 'drivers/net/i40e/i40e_ethdev_vf.c', + 'drivers/net/i40e/i40e_ethdev_vf.c', 'drivers/net/i40e/i40e_pf.c', 'drivers/net/i40e/i40e_rxtx.c', 'drivers/net/i40e/i40e_rxtx_vec.c', |