aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--platform/linux-generic/include/odp_packet_io_internal.h10
-rw-r--r--platform/linux-generic/odp_packet_io.c21
-rw-r--r--platform/linux-generic/pktio/netmap.c6
-rw-r--r--platform/linux-generic/pktio/null.c4
-rw-r--r--platform/linux-generic/pktio/pktio_common.c12
-rw-r--r--platform/linux-generic/pktio/socket.c6
-rw-r--r--platform/linux-generic/pktio/socket_mmap.c6
7 files changed, 31 insertions, 34 deletions
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index 0d8213e4f..aed6de412 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -147,8 +147,8 @@ struct pktio_entry {
/* Storage for queue handles
* Multi-queue support is pktio driver specific */
- unsigned num_in_queue;
- unsigned num_out_queue;
+ uint32_t num_in_queue;
+ uint32_t num_out_queue;
struct {
odp_queue_t queue;
@@ -230,8 +230,8 @@ typedef struct pktio_if_ops {
int num);
int (*recv_tmo)(pktio_entry_t *entry, int index, odp_packet_t packets[],
int num, uint64_t wait_usecs);
- int (*recv_mq_tmo)(pktio_entry_t *entry[], int index[], int num_q,
- odp_packet_t packets[], int num, unsigned *from,
+ int (*recv_mq_tmo)(pktio_entry_t *entry[], int index[], uint32_t num_q,
+ odp_packet_t packets[], int num, uint32_t *from,
uint64_t wait_usecs);
int (*fd_set)(pktio_entry_t *entry, int index, fd_set *readfds);
int (*send)(pktio_entry_t *entry, int index,
@@ -334,7 +334,7 @@ extern const pktio_if_ops_t * const _odp_pktio_if_ops[];
* @return <0 on failure
*/
int _odp_sock_recv_mq_tmo_try_int_driven(const struct odp_pktin_queue_t queues[],
- unsigned int num_q, unsigned int *from,
+ uint32_t num_q, uint32_t *from,
odp_packet_t packets[], int num,
uint64_t usecs,
int *trial_successful);
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index b4fd857a9..7c68b10c5 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -669,8 +669,8 @@ int odp_pktio_start(odp_pktio_t hdl)
mode = entry->s.param.in_mode;
if (mode == ODP_PKTIN_MODE_SCHED) {
- unsigned int i;
- unsigned int num = entry->s.num_in_queue;
+ uint32_t i;
+ uint32_t num = entry->s.num_in_queue;
int index[num];
odp_queue_t odpq[num];
@@ -2169,8 +2169,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio,
pktio_entry_t *entry;
odp_pktin_mode_t mode;
odp_pktio_capability_t capa;
- unsigned int num_queues;
- unsigned int i;
+ uint32_t num_queues, i;
int rc;
odp_queue_t queue;
odp_pktin_queue_param_t default_param;
@@ -2333,7 +2332,7 @@ int _odp_pktio_pktout_tm_config(odp_pktio_t pktio_hdl,
bool pktio_started = false;
odp_pktout_mode_t mode;
pktio_entry_t *entry;
- unsigned int i;
+ uint32_t i;
int rc = 0;
odp_pktout_queue_param_init(&param);
@@ -2403,8 +2402,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio,
pktio_entry_t *entry;
odp_pktout_mode_t mode;
odp_pktio_capability_t capa;
- unsigned int num_queues;
- unsigned int i;
+ uint32_t num_queues, i;
int rc;
odp_pktout_queue_param_t default_param;
@@ -2770,18 +2768,17 @@ int odp_pktin_recv_tmo(odp_pktin_queue_t queue, odp_packet_t packets[], int num,
}
}
-int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], unsigned int num_q,
- unsigned int *from, odp_packet_t packets[], int num,
- uint64_t wait)
+int odp_pktin_recv_mq_tmo(const odp_pktin_queue_t queues[], uint32_t num_q, uint32_t *from,
+ odp_packet_t packets[], int num, uint64_t wait)
{
- unsigned int i;
+ uint32_t i;
int ret;
odp_time_t t1, t2;
struct timespec ts;
int started = 0;
uint64_t sleep_round = 0;
int trial_successful = 0;
- unsigned int lfrom = 0;
+ uint32_t lfrom = 0;
for (i = 0; i < num_q; i++) {
ret = odp_pktin_recv(queues[i], packets, num);
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index 7abc2ddfa..94b88e21e 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -1051,11 +1051,11 @@ static int netmap_recv_tmo(pktio_entry_t *pktio_entry, int index,
}
static int netmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[],
- int num_q, odp_packet_t pkt_table[], int num,
- unsigned *from, uint64_t usecs)
+ uint32_t num_q, odp_packet_t pkt_table[], int num,
+ uint32_t *from, uint64_t usecs)
{
struct timeval timeout;
- int i;
+ uint32_t i;
int ret;
int maxfd = -1, maxfd2;
fd_set readfds;
diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c
index 90e113ec6..a6498da8c 100644
--- a/platform/linux-generic/pktio/null.c
+++ b/platform/linux-generic/pktio/null.c
@@ -71,9 +71,9 @@ static int null_recv_tmo(pktio_entry_t *pktio_entry ODP_UNUSED,
}
static int null_recv_mq_tmo(pktio_entry_t *pktio_entry[] ODP_UNUSED,
- int index[] ODP_UNUSED, int num_q ODP_UNUSED,
+ int index[] ODP_UNUSED, uint32_t num_q ODP_UNUSED,
odp_packet_t pkt_table[] ODP_UNUSED,
- int num ODP_UNUSED, unsigned *from ODP_UNUSED,
+ int num ODP_UNUSED, uint32_t *from ODP_UNUSED,
uint64_t usecs)
{
struct timeval timeout;
diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c
index d2f4d7219..1f3cf951e 100644
--- a/platform/linux-generic/pktio/pktio_common.c
+++ b/platform/linux-generic/pktio/pktio_common.c
@@ -11,13 +11,13 @@
static int sock_recv_mq_tmo_select(pktio_entry_t * const *entry,
const int index[],
- unsigned int num_q, unsigned int *from,
+ uint32_t num_q, uint32_t *from,
odp_packet_t packets[], int num,
uint64_t usecs, fd_set *readfds,
int maxfd)
{
struct timeval timeout;
- unsigned int i;
+ uint32_t i;
int ret;
for (i = 0; i < num_q; i++) {
@@ -50,17 +50,17 @@ static int sock_recv_mq_tmo_select(pktio_entry_t * const *entry,
}
int _odp_sock_recv_mq_tmo_try_int_driven(const struct odp_pktin_queue_t queues[],
- unsigned int num_q, unsigned int *from,
+ uint32_t num_q, uint32_t *from,
odp_packet_t packets[], int num,
uint64_t usecs, int *trial_successful)
{
- unsigned int i;
+ uint32_t i;
pktio_entry_t *entry[num_q];
int index[num_q];
fd_set readfds;
int maxfd = -1;
- int (*impl)(pktio_entry_t *entry[], int index[], int num_q,
- odp_packet_t packets[], int num, unsigned int *from,
+ int (*impl)(pktio_entry_t *entry[], int index[], uint32_t num_q,
+ odp_packet_t packets[], int num, uint32_t *from,
uint64_t wait_usecs) = NULL;
int impl_set = 0;
diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c
index 6884471d4..9d1bbe545 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -376,11 +376,11 @@ static int sock_recv_tmo(pktio_entry_t *pktio_entry, int index,
}
static int sock_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[],
- int num_q, odp_packet_t pkt_table[], int num,
- unsigned *from, uint64_t usecs)
+ uint32_t num_q, odp_packet_t pkt_table[], int num,
+ uint32_t *from, uint64_t usecs)
{
struct timeval timeout;
- int i;
+ uint32_t i;
int ret;
int maxfd = -1, maxfd2;
fd_set readfds;
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index b3c85652f..7824b0e91 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -737,11 +737,11 @@ static int sock_mmap_recv_tmo(pktio_entry_t *pktio_entry, int index,
}
static int sock_mmap_recv_mq_tmo(pktio_entry_t *pktio_entry[], int index[],
- int num_q, odp_packet_t pkt_table[], int num,
- unsigned *from, uint64_t usecs)
+ uint32_t num_q, odp_packet_t pkt_table[], int num,
+ uint32_t *from, uint64_t usecs)
{
struct timeval timeout;
- int i;
+ uint32_t i;
int ret;
int maxfd = -1, maxfd2;
fd_set readfds;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 19:53:33 +0000