patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] net/mvpp2: fix declare unsupported vlan offload features
@ 2021-07-11 13:13 danat
  2021-07-12  9:09 ` [dpdk-stable] [dpdk-dev] " Jerin Jacob
  0 siblings, 1 reply; 2+ messages in thread
From: danat @ 2021-07-11 13:13 UTC (permalink / raw)
  To: jerinj; +Cc: dev, danat, lironh, Meir Levi, stable

From: Meir Levi <mlevi4@marvell.com>

vlan_strip and vlan_extend features need to return "unsupported"
error value.

Fixes: ff0b8b10dc4 ("net/mvpp2: support VLAN offload")
Cc: stable@dpdk.org

Signed-off-by: Meir Levi <mlevi4@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
---
 drivers/net/mvpp2/mrvl_ethdev.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 1802695a0e..078aefbb8d 100644
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -1873,8 +1873,10 @@ static int mrvl_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 	uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
 	int ret;
 
-	if (mask & ETH_VLAN_STRIP_MASK)
+	if (mask & ETH_VLAN_STRIP_MASK) {
 		MRVL_LOG(ERR, "VLAN stripping is not supported\n");
+		return -ENOTSUP;
+	}
 
 	if (mask & ETH_VLAN_FILTER_MASK) {
 		if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
@@ -1886,8 +1888,10 @@ static int mrvl_vlan_offload_set(struct rte_eth_dev *dev, int mask)
 			return ret;
 	}
 
-	if (mask & ETH_VLAN_EXTEND_MASK)
+	if (mask & ETH_VLAN_EXTEND_MASK) {
 		MRVL_LOG(ERR, "Extend VLAN not supported\n");
+		return -ENOTSUP;
+	}
 
 	return 0;
 }
-- 
2.17.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH] net/mvpp2: fix declare unsupported vlan offload features
  2021-07-11 13:13 [dpdk-stable] [PATCH] net/mvpp2: fix declare unsupported vlan offload features danat
@ 2021-07-12  9:09 ` Jerin Jacob
  0 siblings, 0 replies; 2+ messages in thread
From: Jerin Jacob @ 2021-07-12  9:09 UTC (permalink / raw)
  To: Dana Vardi; +Cc: Jerin Jacob, dpdk-dev, Liron Himi, Meir Levi, dpdk stable

On Sun, Jul 11, 2021 at 6:43 PM <danat@marvell.com> wrote:
>
> From: Meir Levi <mlevi4@marvell.com>
>
> vlan_strip and vlan_extend features need to return "unsupported"
> error value.
>
> Fixes: ff0b8b10dc4 ("net/mvpp2: support VLAN offload")
> Cc: stable@dpdk.org
>
> Signed-off-by: Meir Levi <mlevi4@marvell.com>
> Reviewed-by: Liron Himi <lironh@marvell.com>


Changed the subject to net/mvpp2: fix VLAN ops return code

Applied to dpdk-next-net-mrvl/for-next-net. Thanks

> ---
>  drivers/net/mvpp2/mrvl_ethdev.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
> index 1802695a0e..078aefbb8d 100644
> --- a/drivers/net/mvpp2/mrvl_ethdev.c
> +++ b/drivers/net/mvpp2/mrvl_ethdev.c
> @@ -1873,8 +1873,10 @@ static int mrvl_vlan_offload_set(struct rte_eth_dev *dev, int mask)
>         uint64_t rx_offloads = dev->data->dev_conf.rxmode.offloads;
>         int ret;
>
> -       if (mask & ETH_VLAN_STRIP_MASK)
> +       if (mask & ETH_VLAN_STRIP_MASK) {
>                 MRVL_LOG(ERR, "VLAN stripping is not supported\n");
> +               return -ENOTSUP;
> +       }
>
>         if (mask & ETH_VLAN_FILTER_MASK) {
>                 if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
> @@ -1886,8 +1888,10 @@ static int mrvl_vlan_offload_set(struct rte_eth_dev *dev, int mask)
>                         return ret;
>         }
>
> -       if (mask & ETH_VLAN_EXTEND_MASK)
> +       if (mask & ETH_VLAN_EXTEND_MASK) {
>                 MRVL_LOG(ERR, "Extend VLAN not supported\n");
> +               return -ENOTSUP;
> +       }
>
>         return 0;
>  }
> --
> 2.17.1
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-07-12  9:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-11 13:13 [dpdk-stable] [PATCH] net/mvpp2: fix declare unsupported vlan offload features danat
2021-07-12  9:09 ` [dpdk-stable] [dpdk-dev] " Jerin Jacob

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).