[dpdk-stable] patch 'doc: fix ethdev port id size' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

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 <chenbo.xia at intel.com>
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 <chenbo.xia at intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 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 <chenbo.xia at intel.com>
 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 at dpdk.org
 
 Signed-off-by: Chenbo Xia <chenbo.xia at intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -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: