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 AF6B1A04B1 for ; Thu, 5 Nov 2020 13:41:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 16B3DC7E8; Thu, 5 Nov 2020 13:41:40 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 991ACC31F for ; Thu, 5 Nov 2020 13:41:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580097; 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=oywRASzMLAqeUC4t4B/iyyiRMgJpAFtkDSOHbQK8eJs=; b=Brb2lyXATlDQVZCU+wjoijPnywbRm05GMieRhQKb/G8XQDnhiiiqHDA7s/PG4DXxz0FSK8 GA1BSPrMoBxti+pgp3u1v65PtjiOmOlORJ+ELXtL0JP7EVQ/HAktKnZ1kV7x1+wYC24Jim Ht7uW3XDcZnOkmwWinZU+If3Y4xGxDo= 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-504-V-AUyxGbOH-j3jbxf3_pkg-1; Thu, 05 Nov 2020 07:41:34 -0500 X-MC-Unique: V-AUyxGbOH-j3jbxf3_pkg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5293A805F00; Thu, 5 Nov 2020 12:41:33 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 570B05C3E1; Thu, 5 Nov 2020 12:41:32 +0000 (UTC) From: Kevin Traynor To: Chenbo Xia Cc: Ferruh Yigit , dpdk stable Date: Thu, 5 Nov 2020 12:39:44 +0000 Message-Id: <20201105124015.306404-37-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'doc: fix ethdev port id size' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/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. 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/414f36aefbaaa2fed3f14b31190aa5f4d316bfd5 Thanks. Kevin. --- >From 414f36aefbaaa2fed3f14b31190aa5f4d316bfd5 Mon Sep 17 00:00:00 2001 From: Chenbo Xia Date: Wed, 30 Sep 2020 12:23:28 +0800 Subject: [PATCH] doc: fix ethdev port id size [ upstream commit ea87c337e59c855f5949029f7f9259329824d515 ] The ethdev port id should be 16 bits now. This patch changes the variable size of port id in docs from 8 bits to 16 bits. Fixes: fdec9301f52d ("doc: add flow classify guides") Fixes: 4a3ef59a10c8 ("examples/flow_filtering: add simple demo of flow API") Signed-off-by: Chenbo Xia Reviewed-by: Ferruh Yigit --- doc/guides/sample_app_ug/flow_classify.rst | 2 +- doc/guides/sample_app_ug/flow_filtering.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst index 003ed03562..a014b7f67a 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -272,5 +272,5 @@ Forwarding application is shown below: static inline int - port_init(uint8_t port, struct rte_mempool *mbuf_pool) + port_init(uint16_t port, struct rte_mempool *mbuf_pool) { struct rte_eth_conf port_conf = port_conf_default; diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index 9dba85acff..d2a02e3b22 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -374,5 +374,5 @@ This function is located in the ``flow_blocks.c`` file. static struct rte_flow * - generate_ipv4_flow(uint8_t port_id, uint16_t rx_q, + generate_ipv4_flow(uint16_t port_id, uint16_t rx_q, uint32_t src_ip, uint32_t src_mask, uint32_t dest_ip, uint32_t dest_mask, -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.972016396 +0000 +++ 0037-doc-fix-ethdev-port-id-size.patch 2020-11-05 12:38:54.238896018 +0000 @@ -1 +1 @@ -From ea87c337e59c855f5949029f7f9259329824d515 Mon Sep 17 00:00:00 2001 +From 414f36aefbaaa2fed3f14b31190aa5f4d316bfd5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ea87c337e59c855f5949029f7f9259329824d515 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index dc40b4d6f9..31175cff0a 100644 +index 003ed03562..a014b7f67a 100644 @@ -32 +33 @@ -index 5e5a6cd8a0..d3653e57b2 100644 +index 9dba85acff..d2a02e3b22 100644 @@ -35 +36 @@ -@@ -385,5 +385,5 @@ This function is located in the ``flow_blocks.c`` file. +@@ -374,5 +374,5 @@ This function is located in the ``flow_blocks.c`` file.