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 99FD0A04F3 for ; Thu, 19 Dec 2019 15:35:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 90A6E1BE8E; Thu, 19 Dec 2019 15:35:25 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 469921BE8E for ; Thu, 19 Dec 2019 15:35:24 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id c9so6200216wrw.8 for ; Thu, 19 Dec 2019 06:35:24 -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=jdNWz6uvIothAfjqEvqnAK4/gex4V0LkL5X5l/gy6lk=; b=l0fK42vqWaSYWU4KKjDiegi9Mg107l0IkN8ltLQ943TnGnbdcEdDfRyfejJGLWtRA7 ErGtEM08ytXaB/gfcQFlKfD9uZRMB9F2UBZZvifKoer9lHtNV2Y+qSDMR5EgOQ4EdchP 4XHznmwi/+owypYkI2VOiq/euCDJ7X/HV10O9EojUqVJAKIPpapr7a+ljMwr1PfbGQ/V yrD87Ki/1sTDJKss7YJVMatJy+xyQiFWi3j+r7mqr5Xmhyp6oGIj0CFy4UPBuBKLtnFL FT+IQQ5jXkr7PtT14ZfAy/z1ZaRqNs0TtfYkmaDjXxdSb6bj+BPjq8w6qup/JFHHZCvY FSPg== 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=jdNWz6uvIothAfjqEvqnAK4/gex4V0LkL5X5l/gy6lk=; b=HhapJOvhT13kZ5Lj20g6qiCewtlUKtmtJ/+1dlg8e9OksY/baBdPsUB7mb5uJ8fDYA r3H5cLT7xqAWc6U0Gtjc22iVvc+qyL7k7dIJV4g22z1h0BZaw3c/qny5yZ2FsDvdL908 m76x8RK/k0Jd3DcGiqAc2A/7PURXf8JkresgmYyNtI/TaHeLuoEz1EMpd4GMdI69BtNi ecJuiZ036yrCqKwEJxzmgCXfl/i4XxLIv1y42UOULISdrXyNghH19qQM09Rd+c5CNMqS HhmhvBf1caJIaK7Vnbzk7hG2t64qQwpvNocf3KkUtzWCCsXclRV90q21SrL+sk93Ug3c Sh1A== X-Gm-Message-State: APjAAAUsVnm7NWP+pk1IgIzZZmrLp5kjlLxUlwQpVSf/HZGDZTdGWJ4z Ky6jH9Sm93d7AMsMWxufvhY= X-Google-Smtp-Source: APXvYqz+VDhM88pdIiVSzcNnVSAVjWMo7wB0xZN9oz36bsxw99Zwfsi2IQjCoWqF6zjFgrcoS8jzMg== X-Received: by 2002:a5d:4085:: with SMTP id o5mr9657531wrp.321.1576766123994; Thu, 19 Dec 2019 06:35:23 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t8sm6593093wrp.69.2019.12.19.06.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:35:23 -0800 (PST) From: luca.boccassi@gmail.com To: Xiaolong Ye Cc: Stephen Hemminger , Ferruh Yigit , dpdk stable Date: Thu, 19 Dec 2019 14:32:38 +0000 Message-Id: <20191219143447.21506-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix typos for ENOTSUP' has been queued to LTS release 17.11.10 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 LTS release 17.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/21/19. 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 050edb2fa4d85364d55746156891270ca91e5aa6 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Wed, 4 Sep 2019 22:05:31 +0800 Subject: [PATCH] ethdev: fix typos for ENOTSUP [ upstream commit e8c7df5d7d3a47446aa3f90d5ee1ca2662fd0531 ] Fixes: af75078fece3 ("first public release") Signed-off-by: Xiaolong Ye Acked-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- lib/librte_ether/rte_ethdev.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 1a730d3ae3..0d56cde76d 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -2696,7 +2696,7 @@ int rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu); * Otherwise, disable VLAN filtering of VLAN packets tagged with *vlan_id*. * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN filtering not configured. + * - (-ENOTSUP) if hardware-assisted VLAN filtering not configured. * - (-ENODEV) if *port_id* invalid. * - (-ENOSYS) if VLAN filtering on *port_id* disabled. * - (-EINVAL) if *vlan_id* > 4095. @@ -2718,7 +2718,7 @@ int rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on); * If 0, Disable VLAN Stripping of the receive queue of the Ethernet port. * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN stripping not configured. + * - (-ENOTSUP) if hardware-assisted VLAN stripping not configured. * - (-ENODEV) if *port_id* invalid. * - (-EINVAL) if *rx_queue_id* invalid. */ @@ -2738,7 +2738,7 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id, * The Tag Protocol ID * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. + * - (-ENOTSUP) if hardware-assisted VLAN TPID setup is not supported. * - (-ENODEV) if *port_id* invalid. */ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id, @@ -2762,7 +2762,7 @@ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id, * ETH_VLAN_EXTEND_OFFLOAD * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN filtering not configured. + * - (-ENOTSUP) if hardware-assisted VLAN filtering not configured. * - (-ENODEV) if *port_id* invalid. */ int rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:26.767932887 +0000 +++ 0011-ethdev-fix-typos-for-ENOTSUP.patch 2019-12-19 14:32:25.421284262 +0000 @@ -1,32 +1,33 @@ -From e8c7df5d7d3a47446aa3f90d5ee1ca2662fd0531 Mon Sep 17 00:00:00 2001 +From 050edb2fa4d85364d55746156891270ca91e5aa6 Mon Sep 17 00:00:00 2001 From: Xiaolong Ye Date: Wed, 4 Sep 2019 22:05:31 +0800 Subject: [PATCH] ethdev: fix typos for ENOTSUP +[ upstream commit e8c7df5d7d3a47446aa3f90d5ee1ca2662fd0531 ] + Fixes: af75078fece3 ("first public release") -Cc: stable@dpdk.org Signed-off-by: Xiaolong Ye Acked-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- - lib/librte_ethdev/rte_ethdev.h | 8 ++++---- + lib/librte_ether/rte_ethdev.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h -index 8fa89bf76a..d9871782e3 100644 ---- a/lib/librte_ethdev/rte_ethdev.h -+++ b/lib/librte_ethdev/rte_ethdev.h -@@ -2477,7 +2477,7 @@ int rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu); +diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h +index 1a730d3ae3..0d56cde76d 100644 +--- a/lib/librte_ether/rte_ethdev.h ++++ b/lib/librte_ether/rte_ethdev.h +@@ -2696,7 +2696,7 @@ int rte_eth_dev_set_mtu(uint16_t port_id, uint16_t mtu); * Otherwise, disable VLAN filtering of VLAN packets tagged with *vlan_id*. * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN filtering not configured. + * - (-ENOTSUP) if hardware-assisted VLAN filtering not configured. * - (-ENODEV) if *port_id* invalid. - * - (-EIO) if device is removed. * - (-ENOSYS) if VLAN filtering on *port_id* disabled. -@@ -2500,7 +2500,7 @@ int rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on); + * - (-EINVAL) if *vlan_id* > 4095. +@@ -2718,7 +2718,7 @@ int rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t vlan_id, int on); * If 0, Disable VLAN Stripping of the receive queue of the Ethernet port. * @return * - (0) if successful. @@ -35,24 +36,24 @@ * - (-ENODEV) if *port_id* invalid. * - (-EINVAL) if *rx_queue_id* invalid. */ -@@ -2520,7 +2520,7 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id, +@@ -2738,7 +2738,7 @@ int rte_eth_dev_set_vlan_strip_on_queue(uint16_t port_id, uint16_t rx_queue_id, * The Tag Protocol ID * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN TPID setup is not supported. + * - (-ENOTSUP) if hardware-assisted VLAN TPID setup is not supported. * - (-ENODEV) if *port_id* invalid. - * - (-EIO) if device is removed. */ -@@ -2546,7 +2546,7 @@ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id, - * ETH_QINQ_STRIP_OFFLOAD + int rte_eth_dev_set_vlan_ether_type(uint16_t port_id, +@@ -2762,7 +2762,7 @@ int rte_eth_dev_set_vlan_ether_type(uint16_t port_id, + * ETH_VLAN_EXTEND_OFFLOAD * @return * - (0) if successful. - * - (-ENOSUP) if hardware-assisted VLAN filtering not configured. + * - (-ENOTSUP) if hardware-assisted VLAN filtering not configured. * - (-ENODEV) if *port_id* invalid. - * - (-EIO) if device is removed. */ + int rte_eth_dev_set_vlan_offload(uint16_t port_id, int offload_mask); -- 2.20.1