Imported Upstream version 17.05

[deb_dpdk.git] / lib / librte_port / rte_port_fd.c

diff --git a/lib/librte_port/rte_port_fd.c b/lib/librte_port/rte_port_fd.c
index 0d640f3..b5b3729 100644 (file)
--- a/lib/librte_port/rte_port_fd.c
+++ b/lib/librte_port/rte_port_fd.c
@@ -67,7 +67,7 @@ static void *
 rte_port_fd_reader_create(void *params, int socket_id)
 {
        struct rte_port_fd_reader_params *conf =
-                       (struct rte_port_fd_reader_params *) params;
+                       params;
        struct rte_port_fd_reader *port;
 
        /* Check input parameters */
@@ -107,17 +107,12 @@ rte_port_fd_reader_create(void *params, int socket_id)
 static int
 rte_port_fd_reader_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts)
 {
-       struct rte_port_fd_reader *p = (struct rte_port_fd_reader *) port;
-       uint32_t i;
+       struct rte_port_fd_reader *p = port;
+       uint32_t i, j;
 
-       if (rte_mempool_get_bulk(p->mempool, (void **) pkts, n_pkts) != 0)
+       if (rte_pktmbuf_alloc_bulk(p->mempool, pkts, n_pkts) != 0)
                return 0;
 
-       for (i = 0; i < n_pkts; i++) {
-               rte_mbuf_refcnt_set(pkts[i], 1);
-               rte_pktmbuf_reset(pkts[i]);
-       }
-
        for (i = 0; i < n_pkts; i++) {
                struct rte_mbuf *pkt = pkts[i];
                void *pkt_data = rte_pktmbuf_mtod(pkt, void *);
@@ -131,12 +126,12 @@ rte_port_fd_reader_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts)
                pkt->pkt_len = n_bytes;
        }
 
-       for ( ; i < n_pkts; i++)
-               rte_pktmbuf_free(pkts[i]);
+       for (j = i; j < n_pkts; j++)
+               rte_pktmbuf_free(pkts[j]);
 
        RTE_PORT_FD_READER_STATS_PKTS_IN_ADD(p, i);
 
-       return n_pkts;
+       return i;
 }
 
 static int
@@ -156,7 +151,7 @@ static int rte_port_fd_reader_stats_read(void *port,
                struct rte_port_in_stats *stats, int clear)
 {
        struct rte_port_fd_reader *p =
-                       (struct rte_port_fd_reader *) port;
+                       port;
 
        if (stats != NULL)
                memcpy(stats, &p->stats, sizeof(p->stats));
@@ -197,7 +192,7 @@ static void *
 rte_port_fd_writer_create(void *params, int socket_id)
 {
        struct rte_port_fd_writer_params *conf =
-               (struct rte_port_fd_writer_params *) params;
+               params;
        struct rte_port_fd_writer *port;
 
        /* Check input parameters */
@@ -253,7 +248,7 @@ static int
 rte_port_fd_writer_tx(void *port, struct rte_mbuf *pkt)
 {
        struct rte_port_fd_writer *p =
-               (struct rte_port_fd_writer *) port;
+               port;
 
        p->tx_buf[p->tx_buf_count++] = pkt;
        RTE_PORT_FD_WRITER_STATS_PKTS_IN_ADD(p, 1);
@@ -269,7 +264,7 @@ rte_port_fd_writer_tx_bulk(void *port,
        uint64_t pkts_mask)
 {
        struct rte_port_fd_writer *p =
-               (struct rte_port_fd_writer *) port;
+               port;
        uint32_t tx_buf_count = p->tx_buf_count;
 
        if ((pkts_mask & (pkts_mask + 1)) == 0) {
@@ -301,7 +296,7 @@ static int
 rte_port_fd_writer_flush(void *port)
 {
        struct rte_port_fd_writer *p =
-               (struct rte_port_fd_writer *) port;
+               port;
 
        if (p->tx_buf_count > 0)
                send_burst(p);
@@ -327,7 +322,7 @@ static int rte_port_fd_writer_stats_read(void *port,
                struct rte_port_out_stats *stats, int clear)
 {
        struct rte_port_fd_writer *p =
-               (struct rte_port_fd_writer *) port;
+               port;
 
        if (stats != NULL)
                memcpy(stats, &p->stats, sizeof(p->stats));
@@ -369,7 +364,7 @@ static void *
 rte_port_fd_writer_nodrop_create(void *params, int socket_id)
 {
        struct rte_port_fd_writer_nodrop_params *conf =
-                       (struct rte_port_fd_writer_nodrop_params *) params;
+                       params;
        struct rte_port_fd_writer_nodrop *port;
 
        /* Check input parameters */
@@ -438,7 +433,7 @@ static int
 rte_port_fd_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
 {
        struct rte_port_fd_writer_nodrop *p =
-               (struct rte_port_fd_writer_nodrop *) port;
+               port;
 
        p->tx_buf[p->tx_buf_count++] = pkt;
        RTE_PORT_FD_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
@@ -454,7 +449,7 @@ rte_port_fd_writer_nodrop_tx_bulk(void *port,
        uint64_t pkts_mask)
 {
        struct rte_port_fd_writer_nodrop *p =
-               (struct rte_port_fd_writer_nodrop *) port;
+               port;
        uint32_t tx_buf_count = p->tx_buf_count;
 
        if ((pkts_mask & (pkts_mask + 1)) == 0) {
@@ -486,7 +481,7 @@ static int
 rte_port_fd_writer_nodrop_flush(void *port)
 {
        struct rte_port_fd_writer_nodrop *p =
-               (struct rte_port_fd_writer_nodrop *) port;
+               port;
 
        if (p->tx_buf_count > 0)
                send_burst_nodrop(p);
@@ -512,7 +507,7 @@ static int rte_port_fd_writer_nodrop_stats_read(void *port,
                struct rte_port_out_stats *stats, int clear)
 {
        struct rte_port_fd_writer_nodrop *p =
-               (struct rte_port_fd_writer_nodrop *) port;
+               port;
 
        if (stats != NULL)
                memcpy(stats, &p->stats, sizeof(p->stats));