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 D8E2DA0518 for ; Fri, 24 Jul 2020 14:01:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D0B001C032; Fri, 24 Jul 2020 14:01:31 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 94AF31C030 for ; Fri, 24 Jul 2020 14:01:30 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id 88so8076273wrh.3 for ; Fri, 24 Jul 2020 05:01:30 -0700 (PDT) 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=rN92R/SOPv2iOhuUpgJiKlWgmHU0Sy3QEguiAcz9g6E=; b=QTEYekZjeoCl1UeWkzETORJ8Y+JPMy6CYtYxc5nJ/ueC4we9qo28O1nYi1YGIe2Pyk GcGBwOP+qA1eaOGDNDrDJsP8YEXSTdI5xScdnpCn9dpZBZsNen9gL0qP6V6NITfO77Hk rc+JikwiexNMXh08tvR3fsspqH07ckUujii88DG4OvWwTiug6LnlzXse0ZNLIKhLP8N5 GG6YKmZXCgIhmNgzyeo6DBa1IZ+l9Zx+C7vNxU4el8VMBXjTd/KDgenehHFgPrfvvG/q N2fMd97iJDnFsXehg/cTUePuBaMO2cU7D0ezGW13HStJINlwv7Isc444lyg4jhGf7vsZ 9LVw== 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=rN92R/SOPv2iOhuUpgJiKlWgmHU0Sy3QEguiAcz9g6E=; b=srMklOEjOHnT4Gr7m+4WNLc/BGgSfLpboBw7v7tRFW866zLRr/0DKErqEiC8LsSmsA dkx4zVSmg2/lRGuUBdAluKRz+HacvROY4eYhILXT+1dskZ1FhTIDjB0gmXOdG6Xo2pAB 4pFP9mDlwWFmTNIne6pFXVJqyIpMHBdf2/FuiaOiMW2k94aXatEOt450lnkrhcmWE63f RdC4L1KXLwrUKfX7BMcvuUC5bOEqVMJBqCojBTZLPx6NhkcFRTqq6XR5UA2vctRRLm2p jOB/MJyezDcJW9Lj2h/mG94rPrOaGlj+LNw37R35QuL8UaHmqHQR5sK4aMP0HacilkXq 1pYg== X-Gm-Message-State: AOAM531owL87HMhhjlqwQUWoc2f3YFBD189Yr4mbs3U2Moa5HA9Ep4R/ KQtBFYrYJGnymd6e3sSczYhxS1ySbjY= X-Google-Smtp-Source: ABdhPJy8OnAXsLg5MXQ60DubwtOEY6b6gxSMp6krBL6tmRYCQkWeBQePQzBWCmCyXH4uAlT6nR8Ydw== X-Received: by 2002:a5d:5682:: with SMTP id f2mr8225028wrv.248.1595592090286; Fri, 24 Jul 2020 05:01:30 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z15sm269791wrn.89.2020.07.24.05.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:01:29 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengchang Tang Cc: Wei Hu , dpdk stable Date: Fri, 24 Jul 2020 12:57:36 +0100 Message-Id: <20200724120030.1863487-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: remove unsupported VLAN capabilities' has been queued to stable release 19.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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 5fd7ff3abfeec493c1b121953cab71205d2aa45c Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Wed, 3 Jun 2020 17:31:58 +0800 Subject: [PATCH] net/hns3: remove unsupported VLAN capabilities [ upstream commit 85c420f5941d0a0e463493e7659fe6ed96afc71b ] This patch removes unsupported vlan capabilities to avoid misleading users. Fixes: a5475d61fa34 ("net/hns3: support VF") Fixes: 1f5ca0b460cd ("net/hns3: support some device operations") Signed-off-by: Chengchang Tang Signed-off-by: Wei Hu (Xavier) --- drivers/net/hns3/hns3_ethdev.c | 2 -- drivers/net/hns3/hns3_ethdev_vf.c | 1 - 2 files changed, 3 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 85d432d36..f2b0fd704 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2379,9 +2379,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) DEV_RX_OFFLOAD_KEEP_CRC | DEV_RX_OFFLOAD_SCATTER | DEV_RX_OFFLOAD_VLAN_STRIP | - DEV_RX_OFFLOAD_QINQ_STRIP | DEV_RX_OFFLOAD_VLAN_FILTER | - DEV_RX_OFFLOAD_VLAN_EXTEND | DEV_RX_OFFLOAD_JUMBO_FRAME | DEV_RX_OFFLOAD_RSS_HASH); info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE; diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 56a1be936..22cd9eb33 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -665,7 +665,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) DEV_RX_OFFLOAD_KEEP_CRC | DEV_RX_OFFLOAD_SCATTER | DEV_RX_OFFLOAD_VLAN_STRIP | - DEV_RX_OFFLOAD_QINQ_STRIP | DEV_RX_OFFLOAD_VLAN_FILTER | DEV_RX_OFFLOAD_JUMBO_FRAME | DEV_RX_OFFLOAD_RSS_HASH); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:49.304406636 +0100 +++ 0018-net-hns3-remove-unsupported-VLAN-capabilities.patch 2020-07-24 12:53:48.191004671 +0100 @@ -1,14 +1,15 @@ -From 85c420f5941d0a0e463493e7659fe6ed96afc71b Mon Sep 17 00:00:00 2001 +From 5fd7ff3abfeec493c1b121953cab71205d2aa45c Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Wed, 3 Jun 2020 17:31:58 +0800 Subject: [PATCH] net/hns3: remove unsupported VLAN capabilities +[ upstream commit 85c420f5941d0a0e463493e7659fe6ed96afc71b ] + This patch removes unsupported vlan capabilities to avoid misleading users. Fixes: a5475d61fa34 ("net/hns3: support VF") Fixes: 1f5ca0b460cd ("net/hns3: support some device operations") -Cc: stable@dpdk.org Signed-off-by: Chengchang Tang Signed-off-by: Wei Hu (Xavier) @@ -18,10 +19,10 @@ 2 files changed, 3 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c -index 33d7c5c7b..4030bd32a 100644 +index 85d432d36..f2b0fd704 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c -@@ -2461,9 +2461,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) +@@ -2379,9 +2379,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) DEV_RX_OFFLOAD_KEEP_CRC | DEV_RX_OFFLOAD_SCATTER | DEV_RX_OFFLOAD_VLAN_STRIP | @@ -32,10 +33,10 @@ DEV_RX_OFFLOAD_RSS_HASH); info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE; diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c -index 16d601270..0fdee4d67 100644 +index 56a1be936..22cd9eb33 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c -@@ -908,7 +908,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) +@@ -665,7 +665,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) DEV_RX_OFFLOAD_KEEP_CRC | DEV_RX_OFFLOAD_SCATTER | DEV_RX_OFFLOAD_VLAN_STRIP |