From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 4AFBCA0679 for ; Tue, 30 Apr 2019 19:01:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0D5085F0D; Tue, 30 Apr 2019 19:01:58 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 8EC3D58CB for ; Tue, 30 Apr 2019 19:01:56 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F009EC05E770; Tue, 30 Apr 2019 17:01:55 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-211.ams2.redhat.com [10.36.117.211]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD88317CF9; Tue, 30 Apr 2019 17:01:54 +0000 (UTC) From: Kevin Traynor To: Bill Hong Cc: Chas Williams , Ferruh Yigit , dpdk stable Date: Tue, 30 Apr 2019 18:01:02 +0100 Message-Id: <20190430170133.2331-7-ktraynor@redhat.com> In-Reply-To: <20190430170133.2331-1-ktraynor@redhat.com> References: <20190430170133.2331-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 30 Apr 2019 17:01:56 +0000 (UTC) Subject: [dpdk-stable] patch 'net: fix Tx VLAN flag for offload emulation' has been queued to LTS release 18.11.2 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.2 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/07/19. 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. Queued patches can be viewed on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 8e135dedcfd61b028e8d9ac03a0c7dcf1e04b87d Mon Sep 17 00:00:00 2001 From: Bill Hong Date: Mon, 25 Mar 2019 11:05:41 -0400 Subject: [PATCH] net: fix Tx VLAN flag for offload emulation [ upstream commit 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f ] A PMD might use rte_vlan_insert to implement Tx VLAN offload. Typically the PMD will insert the VLAN header in the transmit path and then attempt to send the packets. If this fails, the packets are returned to the application which may attempt to send these packets again. If the PKT_TX_VLAN flag is not cleared, the transmit path may attempt to insert the VLAN header again. Fixes: 47aa48b969f8 ("net: fix stripped VLAN flag for offload emulation") Signed-off-by: Bill Hong Signed-off-by: Chas Williams Reviewed-by: Ferruh Yigit --- lib/librte_net/rte_ether.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index c2c5e249f..e0d831113 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -409,5 +409,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m) vh->vlan_tci = rte_cpu_to_be_16((*m)->vlan_tci); - (*m)->ol_flags &= ~PKT_RX_VLAN_STRIPPED; + (*m)->ol_flags &= ~(PKT_RX_VLAN_STRIPPED | PKT_TX_VLAN); return 0; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:14.152529979 +0100 +++ 0007-net-fix-Tx-VLAN-flag-for-offload-emulation.patch 2019-04-30 17:58:13.756140824 +0100 @@ -1 +1 @@ -From 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f Mon Sep 17 00:00:00 2001 +From 8e135dedcfd61b028e8d9ac03a0c7dcf1e04b87d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 54822df75..3a87ff184 100644 +index c2c5e249f..e0d831113 100644 @@ -27 +28 @@ -@@ -411,5 +411,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m) +@@ -409,5 +409,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)