net/enic: remove a conditional from the Tx path

The VLAN insert flag and VLAN tag used in the VIC write descriptor
can be set unconditionally.

Signed-off-by: John Daley <johndale@cisco.com>
Reviewed-by: Hyong Youb Kim <hyonkim@cisco.com>

diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 08d600f..e2002e1 100644 (file)
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -490,8 +490,8 @@ uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                }
 
                mss = 0;
-               vlan_id = 0;
-               vlan_tag_insert = 0;
+               vlan_id = tx_pkt->vlan_tci;
+               vlan_tag_insert = !!(ol_flags & PKT_TX_VLAN_PKT);
                bus_addr = (dma_addr_t)
                           (tx_pkt->buf_iova + tx_pkt->data_off);
 
@@ -531,10 +531,6 @@ uint16_t enic_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
                        }
                }
 
-               if (ol_flags & PKT_TX_VLAN_PKT) {
-                       vlan_tag_insert = 1;
-                       vlan_id = tx_pkt->vlan_tci;
-               }
 
                wq_enet_desc_enc(&desc_tmp, bus_addr, data_len, mss, header_len,
                                 offload_mode, eop, eop, 0, vlan_tag_insert,