X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx4%2Fmlx4.c;h=6c6342f644719d8bcd3423d42cd98f577c556b05;hb=ab351fe1c95cc56f3c73066b1697f5590ef5c301;hp=fa3cb7e8bac6614ca8f93b6ba354cb520c0a1dab;hpb=d8c4ae275582784ec0ff3b2c54a4c861b55bc056;p=dpdk.git

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index fa3cb7e8ba..6c6342f644 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -1264,16 +1264,7 @@ mlx4_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
 			 * offsets but automatically recognizes the packet
 			 * type. For inner L3/L4 checksums, only VXLAN (UDP)
 			 * tunnels are currently supported. */
-#ifdef RTE_NEXT_ABI
 			if (RTE_ETH_IS_TUNNEL_PKT(buf->packet_type))
-#else
-			/* FIXME: since PKT_TX_UDP_TUNNEL_PKT has been removed,
-			 * the outer packet type is unknown. All we know is
-			 * that the L2 header is of unusual length (not
-			 * ETHER_HDR_LEN with or without 802.1Q header). */
-			if ((buf->l2_len != ETHER_HDR_LEN) &&
-			    (buf->l2_len != (ETHER_HDR_LEN + 4)))
-#endif
 				send_flags |= IBV_EXP_QP_BURST_TUNNEL;
 		}
 		if (likely(segs == 1)) {
@@ -2488,7 +2479,6 @@ rxq_cleanup(struct rxq *rxq)
 	memset(rxq, 0, sizeof(*rxq));
 }
 
-#ifdef RTE_NEXT_ABI
 /**
  * Translate RX completion flags to packet type.
  *
@@ -2521,7 +2511,6 @@ rxq_cq_to_pkt_type(uint32_t flags)
 			          IBV_EXP_CQ_RX_IPV6_PACKET, RTE_PTYPE_L3_IPV6);
 	return pkt_type;
 }
-#endif /* RTE_NEXT_ABI */
 
 /**
  * Translate RX completion flags to offload flags.
@@ -2539,11 +2528,6 @@ rxq_cq_to_ol_flags(const struct rxq *rxq, uint32_t flags)
 {
 	uint32_t ol_flags = 0;
 
-#ifndef RTE_NEXT_ABI
-	ol_flags =
-		TRANSPOSE(flags, IBV_EXP_CQ_RX_IPV4_PACKET, PKT_RX_IPV4_HDR) |
-		TRANSPOSE(flags, IBV_EXP_CQ_RX_IPV6_PACKET, PKT_RX_IPV6_HDR);
-#endif
 	if (rxq->csum)
 		ol_flags |=
 			TRANSPOSE(~flags,
@@ -2559,14 +2543,6 @@ rxq_cq_to_ol_flags(const struct rxq *rxq, uint32_t flags)
 	 */
 	if ((flags & IBV_EXP_CQ_RX_TUNNEL_PACKET) && (rxq->csum_l2tun))
 		ol_flags |=
-#ifndef RTE_NEXT_ABI
-			TRANSPOSE(flags,
-				  IBV_EXP_CQ_RX_OUTER_IPV4_PACKET,
-				  PKT_RX_TUNNEL_IPV4_HDR) |
-			TRANSPOSE(flags,
-				  IBV_EXP_CQ_RX_OUTER_IPV6_PACKET,
-				  PKT_RX_TUNNEL_IPV6_HDR) |
-#endif
 			TRANSPOSE(~flags,
 				  IBV_EXP_CQ_RX_OUTER_IP_CSUM_OK,
 				  PKT_RX_IP_CKSUM_BAD) |
@@ -2758,10 +2734,7 @@ mlx4_rx_burst_sp(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
 		NB_SEGS(pkt_buf) = j;
 		PORT(pkt_buf) = rxq->port_id;
 		PKT_LEN(pkt_buf) = pkt_buf_len;
-#ifdef RTE_NEXT_ABI
 		pkt_buf->packet_type = rxq_cq_to_pkt_type(flags);
-#endif
-		pkt_buf->ol_flags = rxq_cq_to_ol_flags(rxq, flags);
 
 		/* Return packet. */
 		*(pkts++) = pkt_buf;
@@ -2921,9 +2894,7 @@ mlx4_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
 		NEXT(seg) = NULL;
 		PKT_LEN(seg) = len;
 		DATA_LEN(seg) = len;
-#ifdef RTE_NEXT_ABI
 		seg->packet_type = rxq_cq_to_pkt_type(flags);
-#endif
 		seg->ol_flags = rxq_cq_to_ol_flags(rxq, flags);
 
 		/* Return packet. */