[dpdk-stable] patch 'ethdev: fix typos for ENOTSUP' has been queued to LTS release 17.11.10

luca.boccassi at gmail.com luca.boccassi at gmail.com
Thu Dec 19 15:32:38 CET 2019


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 <xiaolong.ye at intel.com>
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 <xiaolong.ye at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 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 <xiaolong.ye at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Xiaolong Ye <xiaolong.ye at intel.com>
 Acked-by: Stephen Hemminger <stephen at networkplumber.org>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
- 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
 


More information about the stable mailing list