net/mlx5: remove redundant checks

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Xueming Li <xuemingl@mellanox.com>

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index cdd373e..5278594 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -522,7 +522,6 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                uint16_t ehdr;
                uint8_t cs_flags;
                uint8_t tso = txq->tso_en && (buf->ol_flags & PKT_TX_TCP_SEG);
-               uint8_t is_vlan = !!(buf->ol_flags & PKT_TX_VLAN_PKT);
                uint32_t swp_offsets = 0;
                uint8_t swp_types = 0;
                uint16_t tso_segsz = 0;
@@ -566,11 +565,10 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
                        rte_prefetch0(
                            rte_pktmbuf_mtod(*(pkts + 1), volatile void *));
                cs_flags = txq_ol_cksum_to_cs(buf);
-               txq_mbuf_to_swp(txq, buf, tso, is_vlan,
-                               (uint8_t *)&swp_offsets, &swp_types);
+               txq_mbuf_to_swp(txq, buf, (uint8_t *)&swp_offsets, &swp_types);
                raw = ((uint8_t *)(uintptr_t)wqe) + 2 * MLX5_WQE_DWORD_SIZE;
                /* Replace the Ethernet type by the VLAN if necessary. */
-               if (is_vlan) {
+               if (buf->ol_flags & PKT_TX_VLAN_PKT) {
                        uint32_t vlan = rte_cpu_to_be_32(0x81000000 |
                                                         buf->vlan_tci);
                        unsigned int len = 2 * ETHER_ADDR_LEN - 2;

diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index 1e4b2fd..d65cd1b 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -651,10 +651,11 @@ mlx5_tx_dbrec(struct mlx5_txq_data *txq, volatile struct mlx5_wqe *wqe)
  */
 static __rte_always_inline void
 txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf,
-                uint8_t tso, uint64_t vlan,
-                uint8_t *offsets, uint8_t *swp_types)
+               uint8_t *offsets, uint8_t *swp_types)
 {
-       uint64_t tunnel = buf->ol_flags & PKT_TX_TUNNEL_MASK;
+       const uint64_t vlan = buf->ol_flags & PKT_TX_VLAN_PKT;
+       const uint64_t tunnel = buf->ol_flags & PKT_TX_TUNNEL_MASK;
+       const uint64_t tso = buf->ol_flags & PKT_TX_TCP_SEG;
        const uint64_t csum_flags = buf->ol_flags & PKT_TX_L4_MASK;
        const uint64_t inner_ip =
                buf->ol_flags & (PKT_TX_IPV4 | PKT_TX_IPV6);
@@ -663,8 +664,8 @@ txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf,
        uint16_t idx;
        uint16_t off;
 
-       if (likely(!tunnel || !txq->swp_en ||
-                  (tunnel != PKT_TX_TUNNEL_UDP && tunnel != PKT_TX_TUNNEL_IP)))
+       if (likely(!txq->swp_en || (tunnel != PKT_TX_TUNNEL_UDP &&
+                                   tunnel != PKT_TX_TUNNEL_IP)))
                return;
        /*
         * The index should have:
@@ -684,7 +685,7 @@ txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf,
         * in if any of SWP offsets is set. Therefore, all of the L3 offsets
         * should be set regardless of HW offload.
         */
-       off = buf->outer_l2_len + (vlan ? 4 : 0);
+       off = buf->outer_l2_len + (vlan ? sizeof(struct vlan_hdr) : 0);
        offsets[1] = off >> 1; /* Outer L3 offset. */
        if (tunnel == PKT_TX_TUNNEL_UDP) {
                off += buf->outer_l3_len;