net: add rte prefix to ether defines

[dpdk.git] / drivers / net / axgbe / axgbe_rxtx.c

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index e96e2be..e76601d 100644 (file)
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -70,12 +70,14 @@ int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        rxq->queue_id = queue_idx;
        rxq->port_id = dev->data->port_id;
        rxq->nb_desc = rx_desc;
-       rxq->dma_regs = pdata->xgmac_regs + DMA_CH_BASE +
-               (DMA_CH_INC * rxq->queue_id);
-       rxq->dma_tail_reg = (volatile uint32_t *)(rxq->dma_regs +
+       rxq->dma_regs = (void *)((uint8_t *)pdata->xgmac_regs + DMA_CH_BASE +
+               (DMA_CH_INC * rxq->queue_id));
+       rxq->dma_tail_reg = (volatile uint32_t *)((uint8_t *)rxq->dma_regs +
                                                  DMA_CH_RDTR_LO);
-       rxq->crc_len = (uint8_t)((dev->data->dev_conf.rxmode.offloads &
-                       DEV_RX_OFFLOAD_CRC_STRIP) ? 0 : ETHER_CRC_LEN);
+       if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC)
+               rxq->crc_len = RTE_ETHER_CRC_LEN;
+       else
+               rxq->crc_len = 0;
 
        /* CRC strip in AXGBE supports per port not per queue */
        pdata->crc_strip_enable = (rxq->crc_len == 0) ? 1 : 0;
@@ -369,10 +371,8 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        if (txq->nb_desc % txq->free_thresh != 0)
                txq->vector_disable = 1;
 
-       if ((tx_conf->txq_flags & (uint32_t)ETH_TXQ_FLAGS_NOOFFLOADS) !=
-           ETH_TXQ_FLAGS_NOOFFLOADS) {
+       if (tx_conf->offloads != 0)
                txq->vector_disable = 1;
-       }
 
        /* Allocate TX ring hardware descriptors */
        tsize = txq->nb_desc * sizeof(struct axgbe_tx_desc);
@@ -387,9 +387,9 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
        txq->desc = tz->addr;
        txq->queue_id = queue_idx;
        txq->port_id = dev->data->port_id;
-       txq->dma_regs = pdata->xgmac_regs + DMA_CH_BASE +
-               (DMA_CH_INC * txq->queue_id);
-       txq->dma_tail_reg = (volatile uint32_t *)(txq->dma_regs +
+       txq->dma_regs = (void *)((uint8_t *)pdata->xgmac_regs + DMA_CH_BASE +
+               (DMA_CH_INC * txq->queue_id));
+       txq->dma_tail_reg = (volatile uint32_t *)((uint8_t *)txq->dma_regs +
                                                  DMA_CH_TDTR_LO);
        txq->cur = 0;
        txq->dirty = 0;