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/odp_packet_socket.c | 10 ++++++++++ platform/linux-generic/odp_packet_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 5aa9f10..6c14814 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 mtu_get_sock_mmsg(pktio_entry_t *pktio_entry); int mtu_get_sock_mmap(pktio_entry_t *pktio_entry); +int mac_addr_get_sock_mmsg(pktio_entry_t *pktio_entry, void *mac_addr); + +int mac_addr_get_sock_mmap(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 05d4a71..22de43f 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -847,12 +847,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 = mac_addr_get_sock_mmsg(entry, mac_addr); break; case ODP_PKTIO_TYPE_SOCKET_MMAP: - memcpy(mac_addr, entry->s.pkt_sock_mmap.if_mac, - ETH_ALEN); + ret = mac_addr_get_sock_mmap(entry, mac_addr); break; case ODP_PKTIO_TYPE_LOOPBACK: ret = mac_addr_get_loopback(entry, mac_addr); diff --git a/platform/linux-generic/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c index 8faf7a4..f808ffe 100644 --- a/platform/linux-generic/odp_packet_socket.c +++ b/platform/linux-generic/odp_packet_socket.c @@ -410,3 +410,13 @@ int mtu_get_sock_mmsg(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 mac_addr_get_sock_mmsg(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/odp_packet_socket_mmap.c b/platform/linux-generic/odp_packet_socket_mmap.c index 7f35ce0..e0e7ab4 100644 --- a/platform/linux-generic/odp_packet_socket_mmap.c +++ b/platform/linux-generic/odp_packet_socket_mmap.c @@ -496,3 +496,9 @@ int mtu_get_sock_mmap(pktio_entry_t *pktio_entry) return mtu_get_fd(pktio_entry->s.pkt_sock_mmap.sockfd, pktio_entry->s.name); } + +int mac_addr_get_sock_mmap(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.2.3.g8277175 _______________________________________________ lng-odp mailing list [email protected] https://lists.linaro.org/mailman/listinfo/lng-odp
