diff options
author | Matias Elo <matias.elo@nokia.com> | 2021-10-12 10:33:07 +0300 |
---|---|---|
committer | Petri Savolainen <petri.savolainen@nokia.com> | 2021-10-21 10:53:20 +0300 |
commit | f9a858827f7b51c4d936c1f2966f6f34ad0d3530 (patch) | |
tree | bbd24104bd44b8316648295f7f0e6432df6faaed /platform/linux-generic | |
parent | 89155e3bbf32fb30813085c04b9ebc68d1dda6b5 (diff) |
linux-gen: pktio: fix conversion overflow build errors
Fix "overflow in conversion from 'int' to 'char' changes value" errors when
building with 'pedantic' option.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>
Diffstat (limited to 'platform/linux-generic')
-rw-r--r-- | platform/linux-generic/pktio/ipc.c | 5 | ||||
-rw-r--r-- | platform/linux-generic/pktio/loop.c | 2 | ||||
-rw-r--r-- | platform/linux-generic/pktio/null.c | 4 | ||||
-rw-r--r-- | platform/linux-generic/pktio/pcap.c | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c index ad633e231..f5e5dfde1 100644 --- a/platform/linux-generic/pktio/ipc.c +++ b/platform/linux-generic/pktio/ipc.c @@ -1,5 +1,5 @@ /* Copyright (c) 2015-2018, Linaro Limited - * Copyright (c) 2019, Nokia + * Copyright (c) 2019-2021, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -15,6 +15,7 @@ #include <errno.h> #include <fcntl.h> +#include <stdint.h> #include <sys/mman.h> #include <sys/stat.h> #include <unistd.h> @@ -112,7 +113,7 @@ static inline pkt_ipc_t *pkt_priv(pktio_entry_t *pktio_entry) } /* MAC address for the "ipc" interface */ -static const char pktio_ipc_mac[] = {0x12, 0x12, 0x12, 0x12, 0x12, 0x12}; +static const uint8_t pktio_ipc_mac[] = {0x12, 0x12, 0x12, 0x12, 0x12, 0x12}; static odp_shm_t _ipc_map_remote_pool(const char *name, int pid); diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c index 889a270ea..666e7ce90 100644 --- a/platform/linux-generic/pktio/loop.c +++ b/platform/linux-generic/pktio/loop.c @@ -49,7 +49,7 @@ static inline pkt_loop_t *pkt_priv(pktio_entry_t *pktio_entry) } /* MAC address for the "loop" interface */ -static const char pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01}; +static const uint8_t pktio_loop_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x01}; static int loopback_stats_reset(pktio_entry_t *pktio_entry); static int loopback_init_capability(pktio_entry_t *pktio_entry); diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c index cbcde323c..8a421986b 100644 --- a/platform/linux-generic/pktio/null.c +++ b/platform/linux-generic/pktio/null.c @@ -7,6 +7,8 @@ #include <odp_api.h> #include <odp_packet_io_internal.h> +#include <stdint.h> + typedef struct { int promisc; /**< whether promiscuous mode is on */ } pkt_null_t; @@ -116,7 +118,7 @@ static uint32_t null_mtu_get(pktio_entry_t *pktio_entry ODP_UNUSED) return PKTIO_NULL_MTU; } -static const char null_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x05}; +static const uint8_t null_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x05}; static int null_mac_addr_get(pktio_entry_t *pktio_entry ODP_UNUSED, void *mac_addr) diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c index bf4c87c02..d42840da9 100644 --- a/platform/linux-generic/pktio/pcap.c +++ b/platform/linux-generic/pktio/pcap.c @@ -50,6 +50,7 @@ #include <errno.h> #include <pcap/pcap.h> #include <pcap/bpf.h> +#include <stdint.h> typedef struct { char *fname_rx; /**< name of pcap file for rx */ @@ -75,7 +76,7 @@ static inline pkt_pcap_t *pkt_priv(pktio_entry_t *pktio_entry) #define PKTIO_PCAP_MTU_MIN (68 + _ODP_ETHHDR_LEN) #define PKTIO_PCAP_MTU_MAX (64 * 1024) -static const char pcap_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x04}; +static const uint8_t pcap_mac[] = {0x02, 0xe9, 0x34, 0x80, 0x73, 0x04}; static int pcapif_stats_reset(pktio_entry_t *pktio_entry); |