diff options
| author | Matias Elo <matias.elo@nokia.com> | 2022-06-20 17:40:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 17:40:58 +0300 |
| commit | 6cf762f28a96dc61db44697b9254327e41580a7f (patch) | |
| tree | a1de51fcf09a60bd14c260bb7c5dd44630193828 /platform/linux-generic/odp_pkt_queue.c | |
| parent | 929cd75ba6654e5f635295953cbb20ffdca20c3e (diff) | |
| parent | 6d365eb66573c4cd7fab868bd69395cc9acdc123 (diff) | |
Merge ODP v1.37.0.0v1.37.0.0_DPDK_19.11
Merge ODP linux-generic v1.37.0.0 into linux-dpdk
Diffstat (limited to 'platform/linux-generic/odp_pkt_queue.c')
| -rw-r--r-- | platform/linux-generic/odp_pkt_queue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c index 81ae334c1..e977efc24 100644 --- a/platform/linux-generic/odp_pkt_queue.c +++ b/platform/linux-generic/odp_pkt_queue.c @@ -125,7 +125,7 @@ static int pkt_queue_free_list_add(queue_pool_t *pool, } /* Now add as many queue_blks to the free list as... */ - blks_to_add = MIN(num_blks - start_idx, num_queue_blks); + blks_to_add = _ODP_MIN(num_blks - start_idx, num_queue_blks); queue_blk = &queue_blks->blks[start_idx]; for (cnt = 1; cnt <= blks_to_add; cnt++) { queue_blk->next_queue_blk_idx = start_idx + cnt; @@ -223,7 +223,7 @@ _odp_int_queue_pool_t _odp_queue_pool_create(uint32_t max_num_queues, /* Initialize the queue_blk_tbl_sizes array based upon the * max_queued_pkts. */ - max_queued_pkts = MAX(max_queued_pkts, 64 * UINT32_C(1024)); + max_queued_pkts = _ODP_MAX(max_queued_pkts, 64 * UINT32_C(1024)); queue_region_desc_init(pool, 0, max_queued_pkts / 4); queue_region_desc_init(pool, 1, max_queued_pkts / 64); queue_region_desc_init(pool, 2, max_queued_pkts / 64); @@ -235,7 +235,7 @@ _odp_int_queue_pool_t _odp_queue_pool_create(uint32_t max_num_queues, /* Now allocate the first queue_blk_tbl and add its blks to the free * list. Replenish the queue_blk_t free list. */ - initial_free_list_size = MIN(64 * UINT32_C(1024), max_queued_pkts / 4); + initial_free_list_size = _ODP_MIN(64 * UINT32_C(1024), max_queued_pkts / 4); rc = pkt_queue_free_list_add(pool, initial_free_list_size); if (rc < 0) { free(pool->queue_num_tbl); |