Add temporarly function definitions to odp_packet_io_internal.h instead of odp_packet_socket.h to obtain pktio_entry_t definition
Signed-off-by: Nicolas Morey-Chaisemartin <[email protected]> --- platform/linux-generic/include/odp_packet_io_internal.h | 4 ++++ platform/linux-generic/odp_packet_io.c | 6 ++---- platform/linux-generic/pktio/socket.c | 10 ++++++++++ platform/linux-generic/pktio/socket_mmap.c | 6 ++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h index a9d9fb9..c61abff 100644 --- a/platform/linux-generic/include/odp_packet_io_internal.h +++ b/platform/linux-generic/include/odp_packet_io_internal.h @@ -103,6 +103,10 @@ int sock_mtu_get(pktio_entry_t *pktio_entry); int sock_mmap_mtu_get(pktio_entry_t *pktio_entry); +int sock_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr); + +int sock_mmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr); + #ifdef __cplusplus } #endif diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index c0befff..861ccb0 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -845,12 +845,10 @@ int odp_pktio_mac_addr(odp_pktio_t id, void *mac_addr, int addr_size) switch (entry->s.type) { case ODP_PKTIO_TYPE_SOCKET_BASIC: case ODP_PKTIO_TYPE_SOCKET_MMSG: - memcpy(mac_addr, entry->s.pkt_sock.if_mac, - ETH_ALEN); + ret = sock_mac_addr_get(entry, mac_addr); break; case ODP_PKTIO_TYPE_SOCKET_MMAP: - memcpy(mac_addr, entry->s.pkt_sock_mmap.if_mac, - ETH_ALEN); + ret = sock_mmap_mac_addr_get(entry, mac_addr); break; case ODP_PKTIO_TYPE_LOOPBACK: ret = loopback_mac_addr_get(entry, mac_addr); diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c index 2a6ec23..93742b4 100644 --- a/platform/linux-generic/pktio/socket.c +++ b/platform/linux-generic/pktio/socket.c @@ -412,3 +412,13 @@ int sock_mtu_get(pktio_entry_t *pktio_entry) { return mtu_get_fd(pktio_entry->s.pkt_sock.sockfd, pktio_entry->s.name); } + +/* + * ODP_PACKET_SOCKET_BASIC: + * ODP_PACKET_SOCKET_MMSG: + */ +int sock_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) +{ + memcpy(mac_addr, pktio_entry->s.pkt_sock.if_mac, ETH_ALEN); + return ETH_ALEN; +} diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c index 13bdbe5..a599ed3 100644 --- a/platform/linux-generic/pktio/socket_mmap.c +++ b/platform/linux-generic/pktio/socket_mmap.c @@ -496,3 +496,9 @@ int sock_mmap_mtu_get(pktio_entry_t *pktio_entry) return mtu_get_fd(pktio_entry->s.pkt_sock_mmap.sockfd, pktio_entry->s.name); } + +int sock_mmap_mac_addr_get(pktio_entry_t *pktio_entry, void *mac_addr) +{ + memcpy(mac_addr, pktio_entry->s.pkt_sock_mmap.if_mac, ETH_ALEN); + return ETH_ALEN; +} -- 2.4.5.3.g4915f6f _______________________________________________ lng-odp mailing list [email protected] https://lists.linaro.org/mailman/listinfo/lng-odp
