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 3C5BFA0679 for ; Tue, 30 Apr 2019 19:02:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2ECD55B36; Tue, 30 Apr 2019 19:02:52 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 9FCE829CB for ; Tue, 30 Apr 2019 19:02:50 +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 093C7307B493; Tue, 30 Apr 2019 17:02:50 +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 0286617CF9; Tue, 30 Apr 2019 17:02:48 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Olivier Matz , dpdk stable Date: Tue, 30 Apr 2019 18:01:33 +0100 Message-Id: <20190430170133.2331-38-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.46]); Tue, 30 Apr 2019 17:02:50 +0000 (UTC) Subject: [dpdk-stable] patch 'mbuf: update Tx VLAN and QinQ flags documentation' 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 00ad10cda3ca5dc806256da82bf7afbd354d4052 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 2 Apr 2019 18:09:46 +0100 Subject: [PATCH] mbuf: update Tx VLAN and QinQ flags documentation [ upstream commit 00cc9701e4d3390f80d5f7e8109587fe342718a9 ] Currently PKT_TX_VLAN and PKT_TX_QINQ mbuf flags are documented as they are to say packet contains VLAN or QINQ information. Updating the definition as they are requests from application to driver to insert VLAN or double VLAN tags into packet. Fixes: dc6c911c9993 ("mbuf: use reserved space for double vlan") Fixes: af75078fece3 ("first public release") Signed-off-by: Ferruh Yigit Acked-by: Olivier Matz --- lib/librte_mbuf/rte_mbuf.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index 795015c81..c3bf2fe6d 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -280,7 +280,9 @@ extern "C" { /** - * Second VLAN insertion (QinQ) flag. + * Double VLAN insertion (QinQ) request to driver, driver may offload the + * insertion based on device capability. + * mbuf 'vlan_tci' & 'vlan_tci_outer' must be valid when this flag is set. */ -#define PKT_TX_QINQ (1ULL << 49) /**< TX packet with double VLAN inserted. */ +#define PKT_TX_QINQ (1ULL << 49) /* this old name is deprecated */ #define PKT_TX_QINQ_PKT PKT_TX_QINQ @@ -338,5 +340,7 @@ extern "C" { /** - * TX packet is a 802.1q VLAN packet. + * VLAN tag insertion request to driver, driver may offload the insertion + * based on the device capability. + * mbuf 'vlan_tci' field must be valid when this flag is set. */ #define PKT_TX_VLAN (1ULL << 57) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-30 17:58:15.608608074 +0100 +++ 0038-mbuf-update-Tx-VLAN-and-QinQ-flags-documentation.patch 2019-04-30 17:58:13.835139206 +0100 @@ -1 +1 @@ -From 00cc9701e4d3390f80d5f7e8109587fe342718a9 Mon Sep 17 00:00:00 2001 +From 00ad10cda3ca5dc806256da82bf7afbd354d4052 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 00cc9701e4d3390f80d5f7e8109587fe342718a9 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index f7886dcb3..a6c4a5e18 100644 +index 795015c81..c3bf2fe6d 100644 @@ -26 +27 @@ -@@ -281,7 +281,9 @@ extern "C" { +@@ -280,7 +280,9 @@ extern "C" { @@ -38 +39 @@ -@@ -339,5 +341,7 @@ extern "C" { +@@ -338,5 +340,7 @@ extern "C" {