From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id EF6FF1B505 for ; Fri, 30 Nov 2018 00:13:25 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 30 Nov 2018 01:19:15 +0200 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id wATNCW7S032075; Fri, 30 Nov 2018 01:13:19 +0200 From: Yongseok Koh To: Paul M Stillwell Jr Cc: Thomas Monjalon , dpdk stable Date: Thu, 29 Nov 2018 15:10:22 -0800 Message-Id: <20181129231202.30436-28-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181129231202.30436-1-yskoh@mellanox.com> References: <20181129231202.30436-1-yskoh@mellanox.com> Subject: [dpdk-stable] patch 'ethdev: fix doxygen comment to be with structure' has been queued to LTS release 17.11.5 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 23:13:26 -0000 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 12/01/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. Yongseok --- >>From 3779a3466f6026750904ab585e07c6b4d4405b9f Mon Sep 17 00:00:00 2001 From: Paul M Stillwell Jr 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 Acked-by: Thomas Monjalon --- 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 47e37a6fa..c4f68d1b9 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -944,12 +944,6 @@ struct rte_eth_conf { }; /** - * 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. */ #define DEV_RX_OFFLOAD_VLAN_STRIP 0x00000001 @@ -1010,6 +1004,12 @@ struct rte_pci_device; /** * 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.11.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 15:01:46.500194850 -0800 +++ 0028-ethdev-fix-doxygen-comment-to-be-with-structure.patch 2018-11-29 15:01:45.033960000 -0800 @@ -1,26 +1,27 @@ -From cb0ad8fa267010e5558c0ffe89a3b3229b1e9b8d Mon Sep 17 00:00:00 2001 +From 3779a3466f6026750904ab585e07c6b4d4405b9f Mon Sep 17 00:00:00 2001 From: Paul M Stillwell Jr 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 Acked-by: Thomas Monjalon --- - 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 44b4fb33f..012577b0a 100644 ---- a/lib/librte_ethdev/rte_ethdev.h -+++ b/lib/librte_ethdev/rte_ethdev.h -@@ -870,12 +870,6 @@ struct rte_eth_conf { +diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h +index 47e37a6fa..c4f68d1b9 100644 +--- a/lib/librte_ether/rte_ethdev.h ++++ b/lib/librte_ether/rte_ethdev.h +@@ -944,12 +944,6 @@ struct rte_eth_conf { }; /** @@ -33,7 +34,7 @@ * RX offload capabilities of a device. */ #define DEV_RX_OFFLOAD_VLAN_STRIP 0x00000001 -@@ -1005,6 +999,12 @@ struct rte_eth_switch_info { +@@ -1010,6 +1004,12 @@ struct rte_pci_device; /** * 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.11.0