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 3FFF4A04DD for ; Wed, 28 Oct 2020 11:51:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 38AE14C90; Wed, 28 Oct 2020 11:51:22 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id C742E2C2A for ; Wed, 28 Oct 2020 11:51:19 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id s9so5154749wro.8 for ; Wed, 28 Oct 2020 03:51:19 -0700 (PDT) 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=XSNKAUYhd71qAqwl9tU5GsTt+pyvdUTp23ZF4hl5l5I=; b=ESjl4Vk3j4bqjFozw1MrrdPJGNGAhX5oaeQSUxnDcbQrL5ckwF9h9tCm1br5k1VmZR 4JZsOOT1GwI9DgNC5RiHgZFRP5YbM4V0OqaWr04lxsjxNDs4/0kueutealkTNw6Hx6jj sZvpxr1oy93tqqBsVJcoASU2WuEhtqJEwIqZ3gOInA/Aun8/i372yhgKeoa3Egy7iHnP U5NyEZRn7LsMQMR7zItYWa8gulGlhRzlavNZinDFDRrzGLZanh3JUq2HhrViiptn2iPS wg2QIUQ0P8SyRk/ZMGT6mYCKIiRQdCmWCergRhLiXFwn/lQm9m5BDTuh5KyoByvNffmX vgjg== 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=XSNKAUYhd71qAqwl9tU5GsTt+pyvdUTp23ZF4hl5l5I=; b=fiPH2y7jSo+K/9U9pgvOthPeVdpM0ovVO1DdKT5EUmb4AANa/be97p4uaC0I1p8qAD yFCWxPxsMFk9OIgiefWz4p5jZANHd70JupcNrANaGLy8/ixRw9480ZXEoZZDV7IZZ4sO Cf+7493QcNu+GASS+i22BH16AbDsmKVwmev27iXE9LLMGH8x841gaEll8VTvIjL1aNod gwhMvcrtxq70Q3fCs14dIJ08a8mMAnnO2Bx/KBicuGI+ZBDMKY6lSEiPP8HEdsnU83wd BHTA1C7N0Om5REIt2FyOwDHfXZcwysoPsIZA3ogbDYiRXJsKB6ckddbDsGDuWax/CrQF s93Q== X-Gm-Message-State: AOAM533GtWmnHoTQVitlC+aUBs775qod4VrMqa3U7ZTJAuQR0Pt+oASE o3U+h1FuDWJKSVXgMDt/ezbtT5Cb6lt8Glf1 X-Google-Smtp-Source: ABdhPJxM6ynLdsyvliAxMuS245+prEdyRDGUC9k+zILeQLkHNpo9BBSBZQRaKagIpf+2ro6opPG4ng== X-Received: by 2002:a5d:40d2:: with SMTP id b18mr8215635wrq.155.1603882278447; Wed, 28 Oct 2020 03:51:18 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l8sm6501660wrn.28.2020.10.28.03.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:51:17 -0700 (PDT) From: luca.boccassi@gmail.com To: Chenbo Xia Cc: Ferruh Yigit , dpdk stable Date: Wed, 28 Oct 2020 10:44:15 +0000 Message-Id: <20201028104606.3504127-96-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'doc: fix ethdev port id size' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 076663a6d35318e78732028aeefa22a30b668288 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 bc234b50a7..451a0db88f 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -271,7 +271,7 @@ Forwarding application is shown below: .. code-block:: c 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; const uint16_t rx_rings = 1, tx_rings = 1; diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index 5e5a6cd8a0..d3653e57b2 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -384,7 +384,7 @@ This function is located in the ``flow_blocks.c`` file. .. code-block:: c 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, struct rte_flow_error *error) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:14.769758836 +0000 +++ 0096-doc-fix-ethdev-port-id-size.patch 2020-10-28 10:35:11.648832144 +0000 @@ -1,14 +1,15 @@ -From ea87c337e59c855f5949029f7f9259329824d515 Mon Sep 17 00:00:00 2001 +From 076663a6d35318e78732028aeefa22a30b668288 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") -Cc: stable@dpdk.org Signed-off-by: Chenbo Xia Reviewed-by: Ferruh Yigit @@ -18,7 +19,7 @@ 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 dc40b4d6f9..31175cff0a 100644 +index bc234b50a7..451a0db88f 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -271,7 +271,7 @@ Forwarding application is shown below: