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 84223A054C for ; Fri, 14 Feb 2020 18:05:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7423E1B53; Fri, 14 Feb 2020 18:05:21 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 8BB0E1B53 for ; Fri, 14 Feb 2020 18:05:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DLh3IGhJ7M/NS5Gjrdhm+ig8u4kT6UydGNeEoOh7n1o=; b=api5KxBbkWCloOMZqYM8kFvl/nJViz12lK6VLHSGFUX6Fju8YWxnlfCjUYjVSSdgUk6Ryj 4RWiHENjpGXABzK/yI2KLNWB7AEz4JiQrfRl91qWZLlio3Xiclg9ozg9me+Qm0VdYWb5mJ OEIW5tkPSKYmlpbOwWK5AySScHyl+bg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-47-0VxYN9hbMIaYG-AGVWuPgg-1; Fri, 14 Feb 2020 12:05:15 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A1CA8017CC; Fri, 14 Feb 2020 17:05:14 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1946989F3C; Fri, 14 Feb 2020 17:05:12 +0000 (UTC) From: Kevin Traynor To: Rasesh Mody Cc: dpdk stable Date: Fri, 14 Feb 2020 17:03:18 +0000 Message-Id: <20200214170337.25093-24-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 0VxYN9hbMIaYG-AGVWuPgg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bnx2x: fix VLAN stripped flag' has been queued to LTS release 18.11.7 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 LTS release 18.11.7 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/20/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 rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/9dd5f380b3a8147e90= e9657a578df5376fede361 Thanks. Kevin. --- >From 9dd5f380b3a8147e90e9657a578df5376fede361 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 71ebdf3f6b..a8ce791ebc 100644 --- a/drivers/net/bnx2x/bnx2x_rxtx.c +++ b/drivers/net/bnx2x/bnx2x_rxtx.c @@ -417,5 +417,5 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts,= uint16_t nb_pkts) =09=09if (cqe_fp->pars_flags.flags & PARSING_FLAGS_VLAN) { =09=09=09rx_mb->vlan_tci =3D cqe_fp->vlan_tag; -=09=09=09rx_mb->ol_flags |=3D PKT_RX_VLAN; +=09=09=09rx_mb->ol_flags |=3D PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED; =09=09} =20 --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:38.376930929 +0000 +++ 0024-net-bnx2x-fix-VLAN-stripped-flag.patch=092020-02-14 17:02:36.98840= 7166 +0000 @@ -1 +1 @@ -From 4b4650296ab4f970946c4c7502938f99ec7ea952 Mon Sep 17 00:00:00 2001 +From 9dd5f380b3a8147e90e9657a578df5376fede361 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4b4650296ab4f970946c4c7502938f99ec7ea952 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 0d77035844..e201b68db8 100644 +index 71ebdf3f6b..a8ce791ebc 100644 @@ -23 +24 @@ -@@ -419,5 +419,5 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts= , uint16_t nb_pkts) +@@ -417,5 +417,5 @@ bnx2x_recv_pkts(void *p_rxq, struct rte_mbuf **rx_pkts= , uint16_t nb_pkts)