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 74BC2A051C for ; Tue, 11 Feb 2020 12:41:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D6071BFFD; Tue, 11 Feb 2020 12:41:16 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 3C8B11BFFF for ; Tue, 11 Feb 2020 12:41:15 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id w15so11963294wru.4 for ; Tue, 11 Feb 2020 03:41:15 -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=yDEPqqocLfYBv4WwYgezsiXgFGvu4UhyuKOygP5Sj/0=; b=Kpym40yorYYEbS9fdGisWfQPGFsNwwqSnWBaMg6X20tpOVDbfKgenDHqb79S5//WuK IJUjFJaGvC/1IHsNmLLx6wBuU2vpyCRTukDcR2JksqCSoX6f/wUQRZHuQkIlxXmVPQfx o0S1791zoOdgVCuUS/qjdnt0hhKaVsevLAiD74lkw2327Kjajf/7/qwUF2W1WwjLeERW cUWnoMl+SpN/5YfAdWjZacLCddEc9raOzvHvaQkDCmew5jaCcqaFjexgU0bW04i98HAN J+apJ5VJ+kpMMZzIRfthiay2DzxjD2/1GkEZgXM2yId3z7HHCwSFMtDyrq+yz+PhlUB+ zfDw== 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=yDEPqqocLfYBv4WwYgezsiXgFGvu4UhyuKOygP5Sj/0=; b=Vphmx0S4PfEMiW6n4UJg4qJKfc1gufcuJAlvd4w1Fqei862MgkYO4/ANJCyvelhRRI vOvVQ/o7LG+VlIBs2TACA0Z3DAgGBE/B5JqTLIjNEc6e5pm01f1eOhF/S5zxR7BnL1CM EfqmMruHQaGcK0UUoMk1xhW7Io9epuVRURhOJLcks7/GsetS5QC8B65inLL6uwyQfJ7L taYMxE29CHIB25B8uyKtqy81c9TMfOYkqR4PpGqsHUOTzo50w4MbxJb4EnZFxRFNq0/E qEp1eOoNdrthBG3XXINDEFnhMfA4u+GBzAiIvc3Uvona4AERgYjhz6QepnniAMoeEyF6 XVbA== X-Gm-Message-State: APjAAAUcXpg0Kpq7kBU2f7Jip1f/fBQ6CqaDD5bY6C+puCbudowtK7F4 25xvHpEm3zuRybGTFy3riuY= X-Google-Smtp-Source: APXvYqwCBICuZYeAxwN+5jV8jtUxQGP8IEgUmzuIyy2CQpZnELD7k4lMoGZeAAaH+423V1+V1judXw== X-Received: by 2002:a5d:5044:: with SMTP id h4mr7751090wrt.4.1581421274979; Tue, 11 Feb 2020 03:41:14 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f1sm4890735wro.85.2020.02.11.03.41.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:41:14 -0800 (PST) From: luca.boccassi@gmail.com To: Rasesh Mody Cc: dpdk stable Date: Tue, 11 Feb 2020 11:21:51 +0000 Message-Id: <20200211112216.3929-165-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnx2x: fix VLAN stripped flag' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/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 c9e70309daa3535976b90c930eb99bcdd22e743c Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Tue, 28 Jan 2020 17:43:13 -0800 Subject: [PATCH] net/bnx2x: fix VLAN stripped flag [ upstream commit 4b4650296ab4f970946c4c7502938f99ec7ea952 ] For VLAN packet the tci is saved in rx_mb->vlan_tci, however the STRIPPED offload flag is not set along with PKT_RX_VLAN flag. Set the PKT_RX_VLAN_STRIPPED flag as well. Fixes: 380a7aab1ae2 ("mbuf: rename deprecated VLAN flags") Fixes: b37b528d957c ("mbuf: add new Rx flags for stripped VLAN") Signed-off-by: Rasesh Mody --- drivers/net/bnx2x/bnx2x_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c index 0d77035844..e201b68db8 100644 --- a/drivers/net/bnx2x/bnx2x_rxtx.c +++ b/drivers/net/bnx2x/bnx2x_rxtx.c @@ -418,7 +418,7 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) */ if (cqe_fp->pars_flags.flags & PARSING_FLAGS_VLAN) { rx_mb->vlan_tci = cqe_fp->vlan_tag; - rx_mb->ol_flags |= PKT_RX_VLAN; + rx_mb->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED; } rx_pkts[nb_rx] = rx_mb; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:44.342661133 +0000 +++ 0165-net-bnx2x-fix-VLAN-stripped-flag.patch 2020-02-11 11:17:38.780008452 +0000 @@ -1,15 +1,16 @@ -From 4b4650296ab4f970946c4c7502938f99ec7ea952 Mon Sep 17 00:00:00 2001 +From c9e70309daa3535976b90c930eb99bcdd22e743c Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Tue, 28 Jan 2020 17:43:13 -0800 Subject: [PATCH] net/bnx2x: fix VLAN stripped flag +[ upstream commit 4b4650296ab4f970946c4c7502938f99ec7ea952 ] + For VLAN packet the tci is saved in rx_mb->vlan_tci, however the STRIPPED offload flag is not set along with PKT_RX_VLAN flag. Set the PKT_RX_VLAN_STRIPPED flag as well. Fixes: 380a7aab1ae2 ("mbuf: rename deprecated VLAN flags") Fixes: b37b528d957c ("mbuf: add new Rx flags for stripped VLAN") -Cc: stable@dpdk.org Signed-off-by: Rasesh Mody ---