diff mbox

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

Message ID 1490257471-18526-1-git-send-email-arybchenko@solarflare.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Andrew Rybchenko March 23, 2017, 8:24 a.m. UTC 
  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@solarflare.com>
---
Please, squash the patch into c5a7da9b5d10.

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

Comments

Ferruh Yigit March 23, 2017, 10:37 a.m. UTC | #1 
On 3/23/2017 8:24 AM, Andrew Rybchenko wrote:
> 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@solarflare.com>
> ---
> Please, squash the patch into c5a7da9b5d10.

On next-net, squashed on top of c5a7da9b5d10, thanks.
diff mbox

Patch

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;