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 /src/trex_defs.h | |
| 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 'src/trex_defs.h')
| -rw-r--r-- | src/trex_defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/trex_defs.h b/src/trex_defs.h index 8a4bf664..60a60df9 100644 --- a/src/trex_defs.h +++ b/src/trex_defs.h @@ -21,7 +21,7 @@ limitations under the License. #ifndef __TREX_DEFS_H__ #define __TREX_DEFS_H__ -#define TREX_MAX_PORTS 12 +#define TREX_MAX_PORTS 16 // maximum number of IP ID type flow stats we support #define MAX_FLOW_STATS 127 |