From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
Cc: Ivan Malov <ivan.malov@oktetlabs.ru>
Subject: [dpdk-dev] [PATCH] net/sfc: fix incorrect rebase during development
Date: Thu, 23 Mar 2017 08:24:31 +0000 [thread overview]
Message-ID: <1490257471-18526-1-git-send-email-arybchenko@solarflare.com> (raw)
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
next reply other threads:[~2017-03-23 9:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-23 8:24 Andrew Rybchenko [this message]
2017-03-23 10:37 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1490257471-18526-1-git-send-email-arybchenko@solarflare.com \
--to=arybchenko@solarflare.com \
--cc=dev@dpdk.org \
--cc=ivan.malov@oktetlabs.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).