* [dpdk-dev] [PATCH] net/sfc: fix incorrect rebase during development
@ 2017-03-23 8:24 Andrew Rybchenko
2017-03-23 10:37 ` Ferruh Yigit
0 siblings, 1 reply; 2+ messages in thread
From: Andrew Rybchenko @ 2017-03-23 8:24 UTC (permalink / raw)
To: dev; +Cc: Ivan Malov
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(-)
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-dev] [PATCH] net/sfc: fix incorrect rebase during development
2017-03-23 8:24 [dpdk-dev] [PATCH] net/sfc: fix incorrect rebase during development Andrew Rybchenko
@ 2017-03-23 10:37 ` Ferruh Yigit
0 siblings, 0 replies; 2+ messages in thread
From: Ferruh Yigit @ 2017-03-23 10:37 UTC (permalink / raw)
To: Andrew Rybchenko, dev; +Cc: Ivan Malov
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-23 10:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-23 8:24 [dpdk-dev] [PATCH] net/sfc: fix incorrect rebase during development Andrew Rybchenko
2017-03-23 10:37 ` Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).