net/mlx5: add C++ include guard to public header

[dpdk.git] / drivers / net / iavf / iavf_rxtx.c

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 154472c..94819e5 100644 (file)
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -648,8 +648,8 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx,
                return -ENOMEM;
        }
 
-       /* Allocate the maximun number of RX ring hardware descriptor with
-        * a liitle more to support bulk allocate.
+       /* Allocate the maximum number of RX ring hardware descriptor with
+        * a little more to support bulk allocate.
         */
        len = IAVF_MAX_RING_DESC + IAVF_RX_MAX_BURST;
        ring_size = RTE_ALIGN(len * sizeof(union iavf_rx_desc),
@@ -2428,10 +2428,9 @@ iavf_fill_data_desc(volatile struct iavf_tx_desc *desc,
        desc->buffer_addr = rte_mbuf_data_iova(m);
 
        /* calculate data buffer size less set header lengths */
-       if ((m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) &&
-                       (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG |
-                                       RTE_MBUF_F_TX_UDP_SEG))) {
-               hdrlen += m->outer_l3_len;
+       if (m->ol_flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG)) {
+               if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)
+                       hdrlen += m->outer_l3_len;
                if (m->ol_flags & RTE_MBUF_F_TX_L4_MASK)
                        hdrlen += m->l3_len + m->l4_len;
                else