[dpdk-stable] patch 'mbuf: explicit cast of headroom on reset' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

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

Yongseok

---
>From 1a5e0f682a80f21a98a0b2c4feb06f824094451e Mon Sep 17 00:00:00 2001
From: Andy Green <andy at warmcat.com>
Date: Thu, 17 May 2018 21:49:37 +0800
Subject: [PATCH] mbuf: explicit cast of headroom on reset

[ upstream commit 553ff494cb4d7fa9539911d3bbb4d94de5f69f20 ]

GCC 8.1 warned:

rte_common.h:384:2:
warning: conversion from 'int' to 'uint16_t'
{aka 'short unsigned int'} may change value [-Wconversion]
  __extension__ ({ \
  ^~~~~~~~~~~~~
rte_mbuf.h:1204:16:
note: in expansion of macro 'RTE_MIN'
  m->data_off = RTE_MIN(RTE_PKTMBUF_HEADROOM, (uint16_t)m->buf_len);

RTE_PKTMBUF_HEADROOM is typ 128, so it doesn't make trouble.

Fixes: 08b563ffb19d ("mbuf: replace data pointer by an offset")

Signed-off-by: Andy Green <andy at warmcat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 lib/librte_mbuf/rte_mbuf.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index ce1ae55b7..5b9139739 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -1144,7 +1144,8 @@ rte_pktmbuf_priv_size(struct rte_mempool *mp)
  */
 static inline void rte_pktmbuf_reset_headroom(struct rte_mbuf *m)
 {
-	m->data_off = RTE_MIN(RTE_PKTMBUF_HEADROOM, (uint16_t)m->buf_len);
+	m->data_off = (uint16_t)RTE_MIN((uint16_t)RTE_PKTMBUF_HEADROOM,
+					(uint16_t)m->buf_len);
 }
 
 /**
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-02 23:59:13.365609496 -0800
+++ 0024-mbuf-explicit-cast-of-headroom-on-reset.patch	2019-01-02 23:59:12.080818000 -0800
@@ -1,8 +1,10 @@
-From 553ff494cb4d7fa9539911d3bbb4d94de5f69f20 Mon Sep 17 00:00:00 2001
+From 1a5e0f682a80f21a98a0b2c4feb06f824094451e Mon Sep 17 00:00:00 2001
 From: Andy Green <andy at warmcat.com>
 Date: Thu, 17 May 2018 21:49:37 +0800
 Subject: [PATCH] mbuf: explicit cast of headroom on reset
 
+[ upstream commit 553ff494cb4d7fa9539911d3bbb4d94de5f69f20 ]
+
 GCC 8.1 warned:
 
 rte_common.h:384:2:
@@ -17,7 +19,6 @@
 RTE_PKTMBUF_HEADROOM is typ 128, so it doesn't make trouble.
 
 Fixes: 08b563ffb19d ("mbuf: replace data pointer by an offset")
-Cc: stable at dpdk.org
 
 Signed-off-by: Andy Green <andy at warmcat.com>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>
@@ -26,10 +27,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
-index b776a6f24..0a94e3ece 100644
+index ce1ae55b7..5b9139739 100644
 --- a/lib/librte_mbuf/rte_mbuf.h
 +++ b/lib/librte_mbuf/rte_mbuf.h
-@@ -1201,7 +1201,8 @@ rte_pktmbuf_priv_size(struct rte_mempool *mp)
+@@ -1144,7 +1144,8 @@ rte_pktmbuf_priv_size(struct rte_mempool *mp)
   */
  static inline void rte_pktmbuf_reset_headroom(struct rte_mbuf *m)
  {