[lng-odp] [PATCHv6 18/19] linux-generic: pktio: move pktio specific init to the appropriate setup function

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu>
---
 platform/linux-generic/odp_packet_io.c     | 5 -----
 platform/linux-generic/pktio/socket.c      | 5 +++++
 platform/linux-generic/pktio/socket_mmap.c | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/platform/linux-generic/odp_packet_io.c 
b/platform/linux-generic/odp_packet_io.c
index e8bb6c6..5cc7ab9 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -143,11 +143,6 @@ static void init_pktio_entry(pktio_entry_t *entry)
           only when used. */
        entry->s.cls_enabled = 1;
        entry->s.inq_default = ODP_QUEUE_INVALID;
-       memset(&entry->s.pkt_sock, 0, sizeof(entry->s.pkt_sock));
-       memset(&entry->s.pkt_sock_mmap, 0, sizeof(entry->s.pkt_sock_mmap));
-       /* set sockfd to -1, because a valid socked might be initialized to 0 */
-       entry->s.pkt_sock.sockfd = -1;
-       entry->s.pkt_sock_mmap.sockfd = -1;
 
        pktio_classifier_init(entry);
 }
diff --git a/platform/linux-generic/pktio/socket.c 
b/platform/linux-generic/pktio/socket.c
index b9ccd2d..9bd4e8f 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -187,6 +187,11 @@ static int sock_setup_pkt(pktio_entry_t *pktio_entry, 
const char *netdev,
        struct sockaddr_ll sa_ll;
        pkt_sock_t *pkt_sock = &pktio_entry->s.pkt_sock;
 
+       /* Init pktio entry */
+       memset(pkt_sock, 0, sizeof(*pkt_sock));
+       /* set sockfd to -1, because a valid socked might be initialized to 0 */
+       pkt_sock->sockfd = -1;
+
        if (pool == ODP_POOL_INVALID)
                return -1;
        pkt_sock->pool = pool;
diff --git a/platform/linux-generic/pktio/socket_mmap.c 
b/platform/linux-generic/pktio/socket_mmap.c
index fe25d37..2e4b52b 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -433,7 +433,11 @@ static int sock_mmap_open_pkt(odp_pktio_t id ODP_UNUSED,
 
        pkt_sock_mmap_t *const pkt_sock = &pktio_entry->s.pkt_sock_mmap;
        int fanout = 1;
+
+       /* Init pktio entry */
        memset(pkt_sock, 0, sizeof(*pkt_sock));
+       /* set sockfd to -1, because a valid socked might be initialized to 0 */
+       pkt_sock->sockfd = -1;
 
        if (pool == ODP_POOL_INVALID)
                return -1;
-- 
2.4.5.3.g4915f6f


_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp