X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fark%2Fark_ethdev_tx.c;h=72624deb397887ebc633b1db46f4b0d1626d2046;hb=1502d443d8857fd473f474a170b81dc30809bdfd;hp=1967655707aa36b37568ebeb554c4edb0ffeb457;hpb=0bf8b0f16a0ed28175f05cd3aed999ddaed00904;p=dpdk.git

diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c
index 1967655707..72624deb39 100644
--- a/drivers/net/ark/ark_ethdev_tx.c
+++ b/drivers/net/ark/ark_ethdev_tx.c
@@ -42,7 +42,7 @@ struct ark_tx_queue {
 	uint32_t pad[1];
 
 	/* second cache line - fields only used in slow path */
-	MARKER cacheline1 __rte_cache_min_aligned;
+	RTE_MARKER cacheline1 __rte_cache_min_aligned;
 	uint32_t cons_index;		/* hw is done, can be freed */
 } __rte_cache_aligned;
 
@@ -143,8 +143,8 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 		}
 	}
 
-	if (ARK_TX_DEBUG && (nb != nb_pkts)) {
-		PMD_TX_LOG(DEBUG, "TX: Failure to send:"
+	if (ARK_DEBUG_CORE && nb != nb_pkts) {
+		ARK_PMD_LOG(DEBUG, "TX: Failure to send:"
 			   " req: %" PRIU32
 			   " sent: %" PRIU32
 			   " prod: %" PRIU32
@@ -211,12 +211,10 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,
 	struct ark_tx_queue *queue;
 	int status;
 
-	/* Future: divide the Q's evenly with multi-ports */
-	int port = dev->data->port_id;
-	int qidx = port + queue_idx;
+	int qidx = queue_idx;
 
 	if (!rte_is_power_of_2(nb_desc)) {
-		PMD_DRV_LOG(ERR,
+		ARK_PMD_LOG(ERR,
 			    "DPDK Arkville configuration queue size"
 			    " must be power of two %u (%s)\n",
 			    nb_desc, __func__);
@@ -229,7 +227,7 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,
 				   64,
 				   socket_id);
 	if (queue == 0) {
-		PMD_DRV_LOG(ERR, "Failed to allocate tx "
+		ARK_PMD_LOG(ERR, "Failed to allocate tx "
 			    "queue memory in %s\n",
 			    __func__);
 		return -ENOMEM;
@@ -254,7 +252,7 @@ eth_ark_tx_queue_setup(struct rte_eth_dev *dev,
 				   socket_id);
 
 	if (queue->meta_q == 0 || queue->bufs == 0) {
-		PMD_DRV_LOG(ERR, "Failed to allocate "
+		ARK_PMD_LOG(ERR, "Failed to allocate "
 			    "queue memory in %s\n", __func__);
 		rte_free(queue->meta_q);
 		rte_free(queue->bufs);