add prefix to cache line macros

[dpdk.git] / examples / netmap_compat / lib / compat_netmap.c

diff --git a/examples/netmap_compat/lib/compat_netmap.c b/examples/netmap_compat/lib/compat_netmap.c
index 190151e..6a4737a 100644 (file)
--- a/examples/netmap_compat/lib/compat_netmap.c
+++ b/examples/netmap_compat/lib/compat_netmap.c
@@ -324,7 +324,7 @@ netmap_regif(struct nmreq *req, uint32_t idx, uint8_t port)
        if (req->nr_ringid != 0)
                return (-EINVAL);
 
-       rte_snprintf(nmif->ni_name, sizeof(nmif->ni_name), "%s", req->nr_name);
+       snprintf(nmif->ni_name, sizeof(nmif->ni_name), "%s", req->nr_name);
        nmif->ni_version  = req->nr_version;
 
        /* Netmap uses ni_(r|t)x_rings + 1 */
@@ -643,12 +643,12 @@ rte_netmap_init(const struct rte_netmap_conf *conf)
        nmif_sz = NETMAP_IF_RING_OFS(port_rings, port_rings, port_slots);
        sz = nmif_sz * port_num;
 
-       buf_ofs = RTE_ALIGN_CEIL(sz, CACHE_LINE_SIZE);
+       buf_ofs = RTE_ALIGN_CEIL(sz, RTE_CACHE_LINE_SIZE);
        sz = buf_ofs + port_bufs * conf->max_bufsz * port_num;
 
        if (sz > UINT32_MAX ||
                        (netmap.mem = rte_zmalloc_socket(__func__, sz,
-                       CACHE_LINE_SIZE, conf->socket_id)) == NULL) {
+                       RTE_CACHE_LINE_SIZE, conf->socket_id)) == NULL) {
                RTE_LOG(ERR, USER1, "%s: failed to allocate %zu bytes\n",
                        __func__, sz);
                return (-ENOMEM);
@@ -713,7 +713,7 @@ rte_netmap_init_port(uint8_t portid, const struct rte_netmap_port_conf *conf)
 
        for (i = 0; i < conf->nr_tx_rings; i++) {
                ret = rte_eth_tx_queue_setup(portid, i, tx_slots,
-                       conf->socket_id, conf->tx_conf);
+                       conf->socket_id, NULL);
 
                if (ret < 0) {
                        RTE_LOG(ERR, USER1,
@@ -724,7 +724,7 @@ rte_netmap_init_port(uint8_t portid, const struct rte_netmap_port_conf *conf)
                }
 
                ret = rte_eth_rx_queue_setup(portid, i, rx_slots,
-                       conf->socket_id, conf->rx_conf, conf->pool);
+                       conf->socket_id, NULL, conf->pool);
 
                if (ret < 0) {
                        RTE_LOG(ERR, USER1,
@@ -737,8 +737,6 @@ rte_netmap_init_port(uint8_t portid, const struct rte_netmap_port_conf *conf)
 
        /* copy config to the private storage. */
        ports[portid].eth_conf = conf->eth_conf[0];
-       ports[portid].rx_conf = conf->rx_conf[0];
-       ports[portid].tx_conf = conf->tx_conf[0];
        ports[portid].pool = conf->pool;
        ports[portid].socket_id = conf->socket_id;
        ports[portid].nr_tx_rings = conf->nr_tx_rings;