From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BEF11A051C for ; Tue, 11 Feb 2020 12:29:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B7C1B1BF9A; Tue, 11 Feb 2020 12:29:23 +0100 (CET) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id C46C21BF9A for ; Tue, 11 Feb 2020 12:29:22 +0100 (CET) Received: by mail-wm1-f66.google.com with SMTP id q9so3025495wmj.5 for ; Tue, 11 Feb 2020 03:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DfJnwvzG45lXrGXmLvjYqYMBXdD2J0ieFLiLqipi4Nw=; b=jt5UntsoBpbK0GpgTehmaUQpbqPKyk3jntL+MRG9JRAror895PF6OdMScK4ymV4CnI 3LqWFCxCp28/YWRJLraOFkT8MbY0GfQUs8YZZuUN6L9Fozj4gxurIDun0FgWybs7nt38 wQTABX1UE8qYIv/Jw6vKL158gAr+X5WyJzOUZ7LFWBz0K3aTBEo14NcQmr7tlwMOYaZM E1HqNlVbzTP0rBMh8ACCFiTqmuXKL7k3gc/p8PFsuwR+h8Kr1eEbwbuUyOwIDoazd4uh r0RN2Jg0GFeyBA8bitccZQNSWzejuTnhwgsi2/8plIDWLtvDTfjjKXZemte2eT+Obl/6 rfzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DfJnwvzG45lXrGXmLvjYqYMBXdD2J0ieFLiLqipi4Nw=; b=grHvZVhjuB+Eg0rbeJId7FDfCxxHyYsPdPMw3outrVDtJ4wzBuSYpYyPEIsi+xyWYU 1mvodceVnO0RiJ/+DlIzIrrgxy/jaLuf5U+HDeHB5rJnhW/cZGjdv6DpzZtbs+s2Ecd7 Bb5ksEvDbSh1XZopu3Fi9yD3esUu0Zj93Dhw05dv8jSxaerPbN678yq2NsThBnyaNSiD AP8qkwAfxmV2JWihkmfc9SdvoQmK2RHCdRZTV4nprvwBjJqVIswEfCvWCDLA6NusJikA ALjvh8tPqMJDpXPfUSkiDcjHdO/XRMoUaSIap9AiNzakN5guJ1ePbTnlYo14e6fRVKCT Do3g== X-Gm-Message-State: APjAAAWbdPZUrZqb1wJQ4dK/+AAEBdS3/PEavSOM7dqoUQRlhsP2QJ7q qg7VP/ao4ErVNg2IumrrZIiHXXg8uOE= X-Google-Smtp-Source: APXvYqxyZMzDReSPK8SrEW3OwLXmMfNBQ26zUmBSFLHvOR/XOjHmiAMM2P5GB2L883dDqF0sR1finA== X-Received: by 2002:a1c:541b:: with SMTP id i27mr5499520wmb.137.1581420562485; Tue, 11 Feb 2020 03:29:22 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x132sm5678504wmg.0.2020.02.11.03.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:29:21 -0800 (PST) From: luca.boccassi@gmail.com To: Reshma Pattan Cc: Xiaolong Ye , dpdk stable Date: Tue, 11 Feb 2020 11:20:43 +0000 Message-Id: <20200211112216.3929-97-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ixgbe: remove duplicate function declaration' has been queued to stable release 19.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 43275cf718b04338c078912742ac0e67a52d84b9 Mon Sep 17 00:00:00 2001 From: Reshma Pattan Date: Tue, 14 Jan 2020 11:29:43 +0000 Subject: [PATCH] net/ixgbe: remove duplicate function declaration [ upstream commit 1438472e6ec3bb411bc44f17147a2f0d4d0238de ] Remove duplicate declarations of ixgbe_xmit_fixed_burst_vec from ixgbe_rxtx.c Fixes: 646412f9ff62 ("net/ixgbe: remove limit of Tx burst size") Signed-off-by: Reshma Pattan Acked-by: Xiaolong Ye --- drivers/net/ixgbe/ixgbe_rxtx.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index fa572d184d..91f5fe1517 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -87,11 +87,6 @@ #define rte_ixgbe_prefetch(p) do {} while (0) #endif -#ifdef RTE_IXGBE_INC_VECTOR -uint16_t ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts, - uint16_t nb_pkts); -#endif - /********************************************************************* * * TX functions -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:42.241162165 +0000 +++ 0097-net-ixgbe-remove-duplicate-function-declaration.patch 2020-02-11 11:17:38.544004040 +0000 @@ -1,13 +1,14 @@ -From 1438472e6ec3bb411bc44f17147a2f0d4d0238de Mon Sep 17 00:00:00 2001 +From 43275cf718b04338c078912742ac0e67a52d84b9 Mon Sep 17 00:00:00 2001 From: Reshma Pattan Date: Tue, 14 Jan 2020 11:29:43 +0000 Subject: [PATCH] net/ixgbe: remove duplicate function declaration +[ upstream commit 1438472e6ec3bb411bc44f17147a2f0d4d0238de ] + Remove duplicate declarations of ixgbe_xmit_fixed_burst_vec from ixgbe_rxtx.c Fixes: 646412f9ff62 ("net/ixgbe: remove limit of Tx burst size") -Cc: stable@dpdk.org Signed-off-by: Reshma Pattan Acked-by: Xiaolong Ye @@ -16,14 +17,14 @@ 1 file changed, 5 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c -index ac8fae745e..1b9554ce91 100644 +index fa572d184d..91f5fe1517 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -87,11 +87,6 @@ #define rte_ixgbe_prefetch(p) do {} while (0) #endif --#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64) +-#ifdef RTE_IXGBE_INC_VECTOR -uint16_t ixgbe_xmit_fixed_burst_vec(void *tx_queue, struct rte_mbuf **tx_pkts, - uint16_t nb_pkts); -#endif