[dpdk-stable] patch 'net/sfc: add missing header guard to TSO header file' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.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 02/07/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.

Thanks.

Kevin Traynor

---
>From 5682610971d6e9a2e4c6fff4f1ac37ef40214dac Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at oktetlabs.ru>
Date: Wed, 9 Jan 2019 11:05:13 +0000
Subject: [PATCH] net/sfc: add missing header guard to TSO header file

[ upstream commit d542b9577f535b9dc18047b30a9b48acb383c7f8 ]

Add missing header guard, including compiler directive for cplusplus.

Fixes: f1f575be9b76 ("net/sfc: put generalised TSO declarations in a header")

Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/sfc_tso.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/sfc/sfc_tso.h b/drivers/net/sfc/sfc_tso.h
index 3d2faf549..f89aef07c 100644
--- a/drivers/net/sfc/sfc_tso.h
+++ b/drivers/net/sfc/sfc_tso.h
@@ -8,4 +8,11 @@
  */
 
+#ifndef _SFC_TSO_H
+#define _SFC_TSO_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** Standard TSO header length */
 #define SFC_TSOH_STD_LEN	256
@@ -22,2 +29,8 @@
 unsigned int sfc_tso_prepare_header(uint8_t *tsoh, size_t header_len,
 				    struct rte_mbuf **in_seg, size_t *in_off);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* _SFC_TSO_H */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:06.633635430 +0000
+++ 0038-net-sfc-add-missing-header-guard-to-TSO-header-file.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,12 +1,13 @@
-From d542b9577f535b9dc18047b30a9b48acb383c7f8 Mon Sep 17 00:00:00 2001
+From 5682610971d6e9a2e4c6fff4f1ac37ef40214dac Mon Sep 17 00:00:00 2001
 From: Ivan Malov <ivan.malov at oktetlabs.ru>
 Date: Wed, 9 Jan 2019 11:05:13 +0000
 Subject: [PATCH] net/sfc: add missing header guard to TSO header file
 
+[ upstream commit d542b9577f535b9dc18047b30a9b48acb383c7f8 ]
+
 Add missing header guard, including compiler directive for cplusplus.
 
 Fixes: f1f575be9b76 ("net/sfc: put generalised TSO declarations in a header")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>