[dpdk-dev] [PATCH] net/sfc: fix incorrect rebase during development

Andrew Rybchenko arybchenko at solarflare.com
Thu Mar 23 09:24:31 CET 2017


Patch which factors out libefx-based Tx datapath was incorrectly
rebased during development over patch which removes
RTE_LIBRTE_SFC_EFX_TSO config option.

Fixes: c5a7da9b5d10 ("net/sfc: factor out libefx-based Tx datapath")

Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
Please, squash the patch into c5a7da9b5d10.

 drivers/net/sfc/sfc_tx.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index e7ec802..d1a064e 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -668,7 +668,6 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 		 */
 		pkt_descs += sfc_efx_tx_maybe_insert_tag(txq, m_seg, &pend);
 
-#ifdef RTE_LIBRTE_SFC_EFX_TSO
 		if (m_seg->ol_flags & PKT_TX_TCP_SEG) {
 			/*
 			 * We expect correct 'pkt->l[2, 3, 4]_len' values
@@ -706,7 +705,6 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 			 * as for the usual non-TSO path
 			 */
 		}
-#endif /* RTE_LIBRTE_SFC_EFX_TSO */
 
 		for (; m_seg != NULL; m_seg = m_seg->next) {
 			efsys_dma_addr_t	next_frag;
-- 
2.9.3



More information about the dev mailing list