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 8923FA0093 for ; Tue, 19 May 2020 15:08:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 81AE91D603; Tue, 19 May 2020 15:08:06 +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 4CE2F1D603 for ; Tue, 19 May 2020 15:08:05 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id v12so15779830wrp.12 for ; Tue, 19 May 2020 06:08:05 -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=UXQybrL5nBytEqwWZlqBwQvDz1BD2cH7ezz35YcsT6w=; b=k+W4xNw4/SWh3OJRtnNNoIGT0I3+croaRFRL0nudyG21VTPBipf3QJ3pvH+zNSzphU TQC+ug7Hsl96i/LTtocmcIQbqYoxZ7ESsEAkPgF4lH5GlZWarmvFIrF/YN58O2KUIetM FWf4iNOpboJMHa6ytAJaWU+AyU7P+k4aDF2h3zXbGqojqUA00PBhYjBai3rxVjS1gsse /Vg6vG5Nqz892xpaomwkt3AezJARO9UhJDcYhLEyFfxnV2E960LwsMcDZB/EVY+HdCHH esjc0NPe2nH2N7tW7ptbHCZ4wy7J2YDxx6AiXxPmzKgTMu5ZrEQ7fsjhVM0f/wJ7EnDk Ow/Q== 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=UXQybrL5nBytEqwWZlqBwQvDz1BD2cH7ezz35YcsT6w=; b=IBZnKTlNmpl84UWu38oYB31mIdfjRH/JyCvrJnmExyuq8wzMpHxCZheBbU6TU2PJTE b3J58DvBzX9MBuQwHuAAC4bI3njMAHuifewfnR8+k3MRwChkSc0flOKsVEA/M/k1Iv+c dmeTDmh2NhnGqwSCprYxbqPymOWWFHQdzXIqKbRq6RA+5Umo3jP82p/muW4Qh83dW5BF uzpGpZkpzyequIqvHyta8LJTpIiqo11BSgQHE74QOIvy+eKFKOod0FidzuivyaeMCGLA oQlbe/wusCIh82ZYfiq9ydKkY1a/tvna5gPuTxg+peN6l9f9Gtt5KHTBPXs+tLUxn4wi JDOA== X-Gm-Message-State: AOAM533JsK5uHxhCKglb+wkNL5cG3YWjPAwjdHiaLJkHhDOlX/VEbNwM UQdzWAglsjz88NnflQE3mAI= X-Google-Smtp-Source: ABdhPJzWSHkQ8dsdv10RBHWcFT6c7ZnSvgqx4nJwAeSyeQOxInA/G7SSQD74J6/GkhkASM6QmYk2DQ== X-Received: by 2002:a05:6000:1ca:: with SMTP id t10mr25372978wrx.230.1589893685050; Tue, 19 May 2020 06:08:05 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id z7sm21016663wrl.88.2020.05.19.06.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:08:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Wei Zhao Cc: Qi Zhang , dpdk stable Date: Tue, 19 May 2020 14:02:56 +0100 Message-Id: <20200519130549.112823-41-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ice: fix input set of VLAN item' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 39e690ab3b1a2b823b39d7868cbbad8cf41cc110 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Fri, 3 Apr 2020 12:46:07 +0800 Subject: [PATCH] net/ice: fix input set of VLAN item [ upstream commit 5d834926034f311caf3eabc685691cb9cb803f32 ] The input set for inner type of vlan item should be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER. This mac vlan filter is also part of DCF switch filter. Fixes: 47d460d63233 ("net/ice: rework switch filter") Signed-off-by: Wei Zhao Acked-by: Qi Zhang --- drivers/net/ice/ice_switch_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 0d88e0bd7e..1d91d773ec 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -871,7 +871,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vlan_spec->inner_type; list[t].m_u.vlan_hdr.type = UINT16_MAX; - input_set |= ICE_INSET_VLAN_OUTER; + input_set |= ICE_INSET_ETHERTYPE; } t++; } else if (!vlan_spec && !vlan_mask) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.233846675 +0100 +++ 0041-net-ice-fix-input-set-of-VLAN-item.patch 2020-05-19 14:04:44.176647647 +0100 @@ -1,14 +1,15 @@ -From 5d834926034f311caf3eabc685691cb9cb803f32 Mon Sep 17 00:00:00 2001 +From 39e690ab3b1a2b823b39d7868cbbad8cf41cc110 Mon Sep 17 00:00:00 2001 From: Wei Zhao Date: Fri, 3 Apr 2020 12:46:07 +0800 Subject: [PATCH] net/ice: fix input set of VLAN item +[ upstream commit 5d834926034f311caf3eabc685691cb9cb803f32 ] + The input set for inner type of vlan item should be ICE_INSET_ETHERTYPE, not ICE_INSET_VLAN_OUTER. This mac vlan filter is also part of DCF switch filter. Fixes: 47d460d63233 ("net/ice: rework switch filter") -Cc: stable@dpdk.org Signed-off-by: Wei Zhao Acked-by: Qi Zhang @@ -17,18 +18,18 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c -index 81d069e995..686f9c3e3d 100644 +index 0d88e0bd7e..1d91d773ec 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c -@@ -911,7 +911,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], +@@ -871,7 +871,7 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], vlan_spec->inner_type; list[t].m_u.vlan_hdr.type = - vlan_mask->inner_type; + UINT16_MAX; - input_set |= ICE_INSET_VLAN_OUTER; + input_set |= ICE_INSET_ETHERTYPE; } t++; - } + } else if (!vlan_spec && !vlan_mask) { -- 2.20.1