net/cxgbe: fix port ID in Rx mbuf

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

diff --git a/drivers/net/fm10k/fm10k.h b/drivers/net/fm10k/fm10k.h
index ce0f2c8..17a7056 100644 (file)
--- a/drivers/net/fm10k/fm10k.h
+++ b/drivers/net/fm10k/fm10k.h
@@ -44,7 +44,7 @@
 #define FM10K_TX_MAX_MTU_SEG UINT8_MAX
 
 /*
- * byte aligment for HW RX data buffer
+ * byte alignment for HW RX data buffer
  * Datasheet requires RX buffer addresses shall either be 512-byte aligned or
  * be 8-byte aligned but without crossing host memory pages (4KB alignment
  * boundaries). Satisfy first option.
@@ -81,8 +81,6 @@
        RTE_MIN(((txq)->nb_desc - 2), (txq)->free_thresh)
 #define FM10K_TX_RS_THRESH_DIV(txq)        ((txq)->nb_desc)
 
-#define FM10K_VLAN_TAG_SIZE 4
-
 /* Maximum number of MAC addresses per PF/VF */
 #define FM10K_MAX_MACADDR_NUM       64
 
@@ -106,9 +104,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,7 +175,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_* */
+       uint64_t offloads; /* offloads of RTE_ETH_RX_OFFLOAD_* */
 };
 
 /*
@@ -212,8 +207,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_* */
+       uint64_t offloads; /* Offloads of RTE_ETH_TX_OFFLOAD_* */
        uint16_t nb_desc;
        uint16_t port_id;
        uint8_t tx_deferred_start; /** don't start this queue in dev start. */
@@ -309,7 +303,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;
@@ -327,8 +321,15 @@ 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(void *rx_queue);
+
 int
-fm10k_dev_rx_descriptor_done(void *rx_queue, uint16_t offset);
+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);