[dpdk-stable] patch 'net: fix definition of IPv6 traffic class mask' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/28/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 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/96f2d95e20ef31dff5ef463394f99e9c121ae349

Thanks.

Kevin Traynor

---
>From 96f2d95e20ef31dff5ef463394f99e9c121ae349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Br=C3=B8rup?= <mb at smartsharesystems.com>
Date: Mon, 1 Jul 2019 15:38:05 +0200
Subject: [PATCH] net: fix definition of IPv6 traffic class mask
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 854c1333b53f42767b1f5bc731d139d8f675574c ]

IPv6 header TC field is 8 bits, not 4.

Fixes: 9b20c6e9028e ("net: add IPv6 header fields macros")

Signed-off-by: Morten Brørup <mb at smartsharesystems.com>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 lib/librte_net/rte_ip.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_net/rte_ip.h b/lib/librte_net/rte_ip.h
index f9b909090..3cf3081e4 100644
--- a/lib/librte_net/rte_ip.h
+++ b/lib/librte_net/rte_ip.h
@@ -353,5 +353,5 @@ struct ipv6_hdr {
 #define IPV6_HDR_TC_SHIFT 20
 #define IPV6_HDR_FL_MASK ((1u << IPV6_HDR_TC_SHIFT) - 1)
-#define IPV6_HDR_TC_MASK (0xf << IPV6_HDR_TC_SHIFT)
+#define IPV6_HDR_TC_MASK (0xff << IPV6_HDR_TC_SHIFT)
 
 /**
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:22.789833026 +0100
+++ 0036-net-fix-definition-of-IPv6-traffic-class-mask.patch	2019-08-22 19:38:20.457026403 +0100
@@ -1 +1 @@
-From 854c1333b53f42767b1f5bc731d139d8f675574c Mon Sep 17 00:00:00 2001
+From 96f2d95e20ef31dff5ef463394f99e9c121ae349 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 854c1333b53f42767b1f5bc731d139d8f675574c ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index ae3b7e730..059ec80c2 100644
+index f9b909090..3cf3081e4 100644
@@ -24,5 +25,5 @@
-@@ -356,5 +356,5 @@ struct rte_ipv6_hdr {
- #define RTE_IPV6_HDR_TC_SHIFT 20
- #define RTE_IPV6_HDR_FL_MASK ((1u << RTE_IPV6_HDR_TC_SHIFT) - 1)
--#define RTE_IPV6_HDR_TC_MASK (0xf << RTE_IPV6_HDR_TC_SHIFT)
-+#define RTE_IPV6_HDR_TC_MASK (0xff << RTE_IPV6_HDR_TC_SHIFT)
+@@ -353,5 +353,5 @@ struct ipv6_hdr {
+ #define IPV6_HDR_TC_SHIFT 20
+ #define IPV6_HDR_FL_MASK ((1u << IPV6_HDR_TC_SHIFT) - 1)
+-#define IPV6_HDR_TC_MASK (0xf << IPV6_HDR_TC_SHIFT)
++#define IPV6_HDR_TC_MASK (0xff << IPV6_HDR_TC_SHIFT)