From patchwork Thu Mar 23 08:24:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 22147 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A9D851396; Thu, 23 Mar 2017 10:11:01 +0100 (CET) Received: from nbfkord-smmo02.seg.att.com (nbfkord-smmo02.seg.att.com [209.65.160.78]) by dpdk.org (Postfix) with ESMTP id 4BEFA1094 for ; Thu, 23 Mar 2017 10:10:59 +0100 (CET) Received: from unknown [12.187.104.26] (EHLO webmail.solarflare.com) by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) with ESMTP id 32193d85.2b11f6c3d940.556143.00-2487.1449168.nbfkord-smmo02.seg.att.com (envelope-from ); Thu, 23 Mar 2017 09:10:59 +0000 (UTC) X-MXL-Hash: 58d3912361527983-cc676c8d882773767e95600dc23e733b7addad5c Received: from unknown [12.187.104.26] (EHLO webmail.solarflare.com) by nbfkord-smmo02.seg.att.com(mxl_mta-7.2.4-7) over TLS secured channel with ESMTP id f1193d85.0.556142.00-2376.1449163.nbfkord-smmo02.seg.att.com (envelope-from ); Thu, 23 Mar 2017 09:10:58 +0000 (UTC) X-MXL-Hash: 58d39122694414a6-588fb9c154cf7badd1eff161349bd8ef0bada33e Received: from ocex03.SolarFlarecom.com (10.20.40.36) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Thu, 23 Mar 2017 02:10:52 -0700 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server (TLS) id 15.0.1044.25 via Frontend Transport; Thu, 23 Mar 2017 02:10:51 -0700 Received: from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com [10.17.10.10]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2N9AodK003752; Thu, 23 Mar 2017 09:10:50 GMT Received: from uklogin.uk.solarflarecom.com (localhost.localdomain [127.0.0.1]) by uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id v2N9AoGm023733; Thu, 23 Mar 2017 09:10:50 GMT From: Andrew Rybchenko To: CC: Ivan Malov Date: Thu, 23 Mar 2017 08:24:31 +0000 Message-ID: <1490257471-18526-1-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.2.3 MIME-Version: 1.0 X-AnalysisOut: [v=2.1 cv=Ndfgoj34 c=1 sm=1 tr=0 a=8BlWFWvVlq5taO8ncb8nKg==] X-AnalysisOut: [:17 a=6Iz7jQTuP9IA:10 a=zRKbQ67AAAAA:8 a=lgGdH6-7rjfjeGJAx] X-AnalysisOut: [TsA:9 a=PA03WX8tBzeizutn5_OT:22] X-Spam: [F=0.2000000000; CM=0.500; S=0.200(2015072901)] X-MAIL-FROM: X-SOURCE-IP: [12.187.104.26] Subject: [dpdk-dev] [PATCH] net/sfc: fix incorrect rebase during development X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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;