[dpdk-stable] patch 'ethdev: fix doxygen comment to be with structure' has been queued to LTS release 16.11.9

[Luca Boccassi <bluca@debian.org>]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

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/05/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.

Luca Boccassi

---
>From 6a8eae9c064500794ed23ba3bd7573aad24dc443 Mon Sep 17 00:00:00 2001
From: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Date: Tue, 25 Sep 2018 15:31:09 +0100
Subject: [PATCH] ethdev: fix doxygen comment to be with structure

[ upstream commit cb0ad8fa267010e5558c0ffe89a3b3229b1e9b8d ]

The doxygen comment describing the rte_eth_dev_info structure
was separated from the structure itself so move the comment
back to be with the structure.

Fixes: 7238e63bce52 ("ethdev: add support for device offload capabilities")

Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
---
 lib/librte_ether/rte_ethdev.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 981e05770f..41839bbe03 100644
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -841,12 +841,6 @@ struct rte_eth_conf {
 	struct rte_intr_conf intr_conf; /**< Interrupt mode configuration. */
 };
 
-/**
- * A structure used to retrieve the contextual information of
- * an Ethernet device, such as the controlling driver of the device,
- * its PCI context, etc...
- */
-
 /**
  * RX offload capabilities of a device.
  */
@@ -878,6 +872,12 @@ struct rte_eth_conf {
 /**
  * Ethernet device information
  */
+
+/**
+ * A structure used to retrieve the contextual information of
+ * an Ethernet device, such as the controlling driver of the
+ * device, etc...
+ */
 struct rte_eth_dev_info {
 	struct rte_pci_device *pci_dev; /**< Device PCI information. */
 	const char *driver_name; /**< Device Driver name. */
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-10-03 17:44:54.618993224 +0100
+++ 0002-ethdev-fix-doxygen-comment-to-be-with-structure.patch	2018-10-03 17:44:54.566534589 +0100
@@ -1,26 +1,27 @@
-From cb0ad8fa267010e5558c0ffe89a3b3229b1e9b8d Mon Sep 17 00:00:00 2001
+From 6a8eae9c064500794ed23ba3bd7573aad24dc443 Mon Sep 17 00:00:00 2001
 From: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
 Date: Tue, 25 Sep 2018 15:31:09 +0100
 Subject: [PATCH] ethdev: fix doxygen comment to be with structure
 
+[ upstream commit cb0ad8fa267010e5558c0ffe89a3b3229b1e9b8d ]
+
 The doxygen comment describing the rte_eth_dev_info structure
 was separated from the structure itself so move the comment
 back to be with the structure.
 
 Fixes: 7238e63bce52 ("ethdev: add support for device offload capabilities")
-Cc: stable@dpdk.org
 
 Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
 Acked-by: Thomas Monjalon <thomas@monjalon.net>
 ---
- lib/librte_ethdev/rte_ethdev.h | 12 ++++++------
+ lib/librte_ether/rte_ethdev.h | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
-index 44b4fb33fd..012577b0ab 100644
---- a/lib/librte_ethdev/rte_ethdev.h
-+++ b/lib/librte_ethdev/rte_ethdev.h
-@@ -869,12 +869,6 @@ struct rte_eth_conf {
+diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
+index 981e05770f..41839bbe03 100644
+--- a/lib/librte_ether/rte_ethdev.h
++++ b/lib/librte_ether/rte_ethdev.h
+@@ -841,12 +841,6 @@ struct rte_eth_conf {
  	struct rte_intr_conf intr_conf; /**< Interrupt mode configuration. */
  };
  
@@ -33,7 +34,7 @@
  /**
   * RX offload capabilities of a device.
   */
-@@ -1005,6 +999,12 @@ struct rte_eth_switch_info {
+@@ -878,6 +872,12 @@ struct rte_eth_conf {
  /**
   * Ethernet device information
   */
@@ -44,7 +45,7 @@
 + * device, etc...
 + */
  struct rte_eth_dev_info {
- 	struct rte_device *device; /** Generic device information */
+ 	struct rte_pci_device *pci_dev; /**< Device PCI information. */
  	const char *driver_name; /**< Device Driver name. */
 -- 
 2.19.0