[dpdk-stable] patch 'examples/flow_filtering: filter out unsupported offloads' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/29/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 4c95a590c322fa75b517568f98b17b4dd61d7010 Mon Sep 17 00:00:00 2001
From: Ori Kam <orika at mellanox.com>
Date: Mon, 5 Nov 2018 09:35:27 +0000
Subject: [PATCH] examples/flow_filtering: filter out unsupported offloads

[ upstream commit c82f2f8b4b3a32e7a3fe586419ff4fb628ac9f7d ]

Some of the requested offloads are not supported by all devices.

This patch fixes this issue by setting only the supported offloads.

Fixes: feca6c428a5e ("examples/flow_filtering: add Tx queues setup process")

Signed-off-by: Ori Kam <orika at mellanox.com>
Acked-by: Wei Zhao <wei.zhao1 at intel.com>
---
 examples/flow_filtering/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
index ce91e8a6f..86b8f4457 100644
--- a/examples/flow_filtering/main.c
+++ b/examples/flow_filtering/main.c
@@ -154,4 +154,6 @@ init_port(void)
 	struct rte_eth_dev_info dev_info;
 
+	rte_eth_dev_info_get(port_id, &dev_info);
+	port_conf.txmode.offloads &= dev_info.rx_offload_capa;
 	printf(":: initializing port: %d\n", port_id);
 	ret = rte_eth_dev_configure(port_id,
@@ -163,5 +165,4 @@ init_port(void)
 	}
 
-	rte_eth_dev_info_get(port_id, &dev_info);
 	rxq_conf = dev_info.default_rxconf;
 	rxq_conf.offloads = port_conf.rxmode.offloads;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-23 10:22:55.629302454 +0000
+++ 0053-examples-flow_filtering-filter-out-unsupported-offlo.patch	2018-11-23 10:22:54.000000000 +0000
@@ -1,14 +1,15 @@
-From c82f2f8b4b3a32e7a3fe586419ff4fb628ac9f7d Mon Sep 17 00:00:00 2001
+From 4c95a590c322fa75b517568f98b17b4dd61d7010 Mon Sep 17 00:00:00 2001
 From: Ori Kam <orika at mellanox.com>
 Date: Mon, 5 Nov 2018 09:35:27 +0000
 Subject: [PATCH] examples/flow_filtering: filter out unsupported offloads
 
+[ upstream commit c82f2f8b4b3a32e7a3fe586419ff4fb628ac9f7d ]
+
 Some of the requested offloads are not supported by all devices.
 
 This patch fixes this issue by setting only the supported offloads.
 
 Fixes: feca6c428a5e ("examples/flow_filtering: add Tx queues setup process")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ori Kam <orika at mellanox.com>
 Acked-by: Wei Zhao <wei.zhao1 at intel.com>
@@ -17,17 +18,17 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c
-index a73d120e3..27e287ae7 100644
+index ce91e8a6f..86b8f4457 100644
 --- a/examples/flow_filtering/main.c
 +++ b/examples/flow_filtering/main.c
-@@ -137,4 +137,6 @@ init_port(void)
+@@ -154,4 +154,6 @@ init_port(void)
  	struct rte_eth_dev_info dev_info;
  
 +	rte_eth_dev_info_get(port_id, &dev_info);
 +	port_conf.txmode.offloads &= dev_info.rx_offload_capa;
  	printf(":: initializing port: %d\n", port_id);
  	ret = rte_eth_dev_configure(port_id,
-@@ -146,5 +148,4 @@ init_port(void)
+@@ -163,5 +165,4 @@ init_port(void)
  	}
  
 -	rte_eth_dev_info_get(port_id, &dev_info);