From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 7475E1B3AD for ; Wed, 3 Oct 2018 18:52:51 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id o18-v6so6362223wmc.0 for ; Wed, 03 Oct 2018 09:52:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JFr6SjRrhSDSxNAyv6t/51IRIdWB9NmrSI8+ia/cxck=; b=lJ8aewAPeuCCSu48G2k7KwecMj2tP0/YMcShrA1wzR3koSVvzwUa44Gms/RSkG1Wu6 eDDeQ1Fgj7wJFEsvaoQZiIc6K6dLc5sQh2NnHrv5WcAmKrmqT37TQf2CNkCBMXU5lcVr nBr4tzl6RsPSFh+fOPHq+Xfr6mmTeLKDvE9hkNJm0ruBTfWvNTRshN/sZGSUUIu/eXpY JjQIrC/VXE2bao574A0HpnEgToZNtUn8JqSVuzIqi7Kd5RSlGBm1XojSfHBSnXdCbRF3 5MrPFyX054Pge47ynHy0NHZMACLDnamsUdE97m+EPU52vEZhcU8nP65Kc0+whf4r2fMt yZgw== X-Gm-Message-State: ABuFfoiltJC0qhs8uPc9tk8BijZj8pmsdX3RzpOLtnAlAOt4Q7DKYEVD PBpJ7H+zFuR2/EgfyQr7wSM= X-Google-Smtp-Source: ACcGV621Nt5Yhdx7w2FBq6tBSwMo6h7S7o1v5PzshfHQ/7fJC8vLABhuSBFjLUW5Lu3BGjRSxUDtNQ== X-Received: by 2002:a1c:6c09:: with SMTP id h9-v6mr1988316wmc.95.1538585570983; Wed, 03 Oct 2018 09:52:50 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id k93-v6sm3209982wrc.89.2018.10.03.09.52.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Oct 2018 09:52:49 -0700 (PDT) From: Luca Boccassi To: Paul M Stillwell Jr Cc: Thomas Monjalon , dpdk stable Date: Wed, 3 Oct 2018 17:52:35 +0100 Message-Id: <20181003165239.8531-2-bluca@debian.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181003165239.8531-1-bluca@debian.org> References: <20181003162121.16364-1-bluca@debian.org> <20181003165239.8531-1-bluca@debian.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix doxygen comment to be with structure' has been queued to LTS release 16.11.9 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: Wed, 03 Oct 2018 16:52:51 -0000 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 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 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 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 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