net: add rte prefix to ether defines

[dpdk.git] / drivers / net / fm10k / fm10k.h

diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
index 30dad3e..916b856 100644 (file)
--- a/drivers/net/fm10k/fm10k.h
+++ b/drivers/net/fm10k/fm10k.h
@@ -106,9 +106,6 @@
 #define FM10K_MISC_VEC_ID               RTE_INTR_VEC_ZERO_OFFSET
 #define FM10K_RX_VEC_START              RTE_INTR_VEC_RXTX_OFFSET
 
-#define FM10K_SIMPLE_TX_FLAG ((uint32_t)ETH_TXQ_FLAGS_NOMULTSEGS | \
-                               ETH_TXQ_FLAGS_NOOFFLOADS)
-
 struct fm10k_macvlan_filter_info {
        uint16_t vlan_num;       /* Total VLAN number */
        uint16_t mac_num;        /* Total mac number */
@@ -180,6 +177,7 @@ struct fm10k_rx_queue {
        uint8_t drop_en;
        uint8_t rx_deferred_start; /* don't start this queue in dev start. */
        uint16_t rx_ftag_en; /* indicates FTAG RX supported */
+       uint64_t offloads; /* offloads of DEV_RX_OFFLOAD_* */
 };
 
 /*
@@ -211,7 +209,7 @@ struct fm10k_tx_queue {
        uint16_t next_rs; /* Next pos to set RS flag */
        uint16_t next_dd; /* Next pos to check DD flag */
        volatile uint32_t *tail_ptr;
-       uint32_t txq_flags; /* Holds flags for this TXq */
+       uint64_t offloads; /* Offloads of DEV_TX_OFFLOAD_* */
        uint16_t nb_desc;
        uint16_t port_id;
        uint8_t tx_deferred_start; /** don't start this queue in dev start. */
@@ -307,7 +305,7 @@ fm10k_addr_alignment_valid(struct rte_mbuf *mb)
        /* 8B aligned, and max Ethernet frame would not cross a 4KB boundary? */
        if (RTE_ALIGN(addr, 8) == addr) {
                boundary1 = RTE_ALIGN_FLOOR(addr, 4096);
-               boundary2 = RTE_ALIGN_FLOOR(addr + ETHER_MAX_VLAN_FRAME_LEN,
+               boundary2 = RTE_ALIGN_FLOOR(addr + RTE_ETHER_MAX_VLAN_FRAME_LEN,
                                                4096);
                if (boundary1 == boundary2)
                        return 1;
@@ -325,9 +323,19 @@ uint16_t fm10k_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 uint16_t fm10k_recv_scattered_pkts(void *rx_queue,
                struct rte_mbuf **rx_pkts, uint16_t nb_pkts);
 
+uint32_t
+fm10k_dev_rx_queue_count(struct rte_eth_dev *dev, uint16_t rx_queue_id);
+
 int
 fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset);
 
+int
+fm10k_dev_rx_descriptor_status(void *rx_queue, uint16_t offset);
+
+int
+fm10k_dev_tx_descriptor_status(void *rx_queue, uint16_t offset);
+
+
 uint16_t fm10k_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
        uint16_t nb_pkts);