From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0D28AA0093 for ; Wed, 9 Mar 2022 12:03:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 04FBC410DC; Wed, 9 Mar 2022 12:03:43 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 37253410EF for ; Wed, 9 Mar 2022 12:03:41 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id A1C893FA7E for ; Wed, 9 Mar 2022 11:03:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823820; bh=R9vokawmwqj+9oIpYBe0p2YFzEEe+o9+e7/0JyuFX1w=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CXtE28FwbXBx/Fjtv3CgBUSd11xK5+26CWX6aDlzN1pH4Tuc4BRgwlDBw7XHA9FRX Eh4y5sh+jRbyBzGDMVN7gygVZer3vSO8oUllywiho3HB2cRKn9DCf/uVZEuseGqiDg sERA5YUuzivjPIJn4r+Inl7yJEtTgP6eW7DJ3FSwy0NRJ/vbdQTZAZiZ9t9iP3qUwj HVguMmboP+hifYOqAW1X0iIEwz+EiluZOzJPxXk+YdxwqzqxsPpGOi4XhiChbsWiwD 9WqbVcA4UVf+HWVfg5kbZwdym+pwXjxLmBtWcFHBpQqHMt7tvO4CuFA0hH8QuawWaJ ZAkA5W4PhWkwQ== Received: by mail-ed1-f69.google.com with SMTP id co2-20020a0564020c0200b00415f9fa6ca8so1096280edb.6 for ; Wed, 09 Mar 2022 03:03:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R9vokawmwqj+9oIpYBe0p2YFzEEe+o9+e7/0JyuFX1w=; b=XHg7o/iR2pUNggf4heXy9R6V4Us3Su8kvdvW4RgwkhDEr5Ek/WQYFbG9/cpLkIVqhS JLqmVAd0/q8Rf12QhJD6JffVBVlszUiEJeGklpqGMW9QBtcwisZPIFRzWcxN4Xme4dg/ EOD50UHfUi/f4FukUxhol9LLk7WWKUeWr7XPQVm5lYmfey+mzpxjqIngUGYn8mUdIW1X i7WJnTxXdcXeQ/qq4bxWcH5vGBwRK/Rj6Y9BU6KKt2WY5LPepgpmpWWA62aYNHG/EMfV 2Gx9E88kdeMzn0rbEQx32FEydfIfHLvRWkTQtzsl2SMbNNCjtcKJ+kxeQwNGevY3qz6h H3EA== X-Gm-Message-State: AOAM531iKjWty+XlBYc9UoGaQL9wldaGTPjfqnPBMG29+M+Ri0E/S8r6 Gu5rXIJ8S9q6ojXloXFvACice53dur+zSasZSBOwPsAsS9bdP6UnAIllP05tyRm6hKel7rcPVAJ mdoY75RHE1u6hfa1DILbQds0V X-Received: by 2002:a17:906:5c4:b0:6cd:8d9c:3c7d with SMTP id t4-20020a17090605c400b006cd8d9c3c7dmr17845001ejt.554.1646823819624; Wed, 09 Mar 2022 03:03:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzaxF6GWeI6Dv8WPqWQitsL5nNZ1HjyC1WnN+lLzRH//hSyKqOnN+2dL4rrUBQYjatewW5nWA== X-Received: by 2002:a17:906:5c4:b0:6cd:8d9c:3c7d with SMTP id t4-20020a17090605c400b006cd8d9c3c7dmr17844990ejt.554.1646823819408; Wed, 09 Mar 2022 03:03:39 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id kq26-20020a170906abda00b006da87077172sm609472ejb.29.2022.03.09.03.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:03:39 -0800 (PST) From: christian.ehrhardt@canonical.com To: Ferruh Yigit Cc: Bruce Merry , dpdk stable Subject: patch 'ethdev: fix doxygen comments for device info struct' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:01:15 +0100 Message-Id: <20220309110116.1295395-44-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/22. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/1ad09cf616fed817724c90cf26403a4666a079d1 Thanks. Christian Ehrhardt --- >From 1ad09cf616fed817724c90cf26403a4666a079d1 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Tue, 8 Mar 2022 09:47:00 +0000 Subject: [PATCH] ethdev: fix doxygen comments for device info struct [ upstream commit 3b358e330153bc792c688d6da60c80c40eaacb22 ] API documentation for "struct rte_eth_dev_info" was missing some fields 'device' & 'max_hash_mac_addrs', because of syntax error in doxygen comment, fixing it. Bugzilla ID: 954 Fixes: 88ac4396ad29 ("ethdev: add VMDq support") Fixes: cd8c7c7ce241 ("ethdev: replace bus specific struct with generic dev") Reported-by: Bruce Merry Signed-off-by: Ferruh Yigit --- lib/librte_ethdev/rte_ethdev.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 091a77bf21..9cc12ef97e 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -1227,7 +1227,7 @@ struct rte_eth_switch_info { * device, etc... */ struct rte_eth_dev_info { - struct rte_device *device; /** Generic device information */ + struct rte_device *device; /**< Generic device information */ const char *driver_name; /**< Device Driver name. */ unsigned int if_index; /**< Index to bound host interface, or 0 if none. Use if_indextoname() to translate into an interface name. */ @@ -1241,8 +1241,8 @@ struct rte_eth_dev_info { uint16_t max_rx_queues; /**< Maximum number of RX queues. */ uint16_t max_tx_queues; /**< Maximum number of TX queues. */ uint32_t max_mac_addrs; /**< Maximum number of MAC addresses. */ - uint32_t max_hash_mac_addrs; /** Maximum number of hash MAC addresses for MTA and UTA. */ + uint32_t max_hash_mac_addrs; uint16_t max_vfs; /**< Maximum number of VFs. */ uint16_t max_vmdq_pools; /**< Maximum number of VMDq pools. */ uint64_t rx_offload_capa; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:45.654793374 +0100 +++ 0044-ethdev-fix-doxygen-comments-for-device-info-struct.patch 2022-03-09 11:57:43.428938606 +0100 @@ -1 +1 @@ -From 3b358e330153bc792c688d6da60c80c40eaacb22 Mon Sep 17 00:00:00 2001 +From 1ad09cf616fed817724c90cf26403a4666a079d1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3b358e330153bc792c688d6da60c80c40eaacb22 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - lib/ethdev/rte_ethdev.h | 4 ++-- + lib/librte_ethdev/rte_ethdev.h | 4 ++-- @@ -21,5 +22,5 @@ -diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h -index c2d1f9a972..04cff8ee10 100644 ---- a/lib/ethdev/rte_ethdev.h -+++ b/lib/ethdev/rte_ethdev.h -@@ -1855,7 +1855,7 @@ enum rte_eth_representor_type { +diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h +index 091a77bf21..9cc12ef97e 100644 +--- a/lib/librte_ethdev/rte_ethdev.h ++++ b/lib/librte_ethdev/rte_ethdev.h +@@ -1227,7 +1227,7 @@ struct rte_eth_switch_info { @@ -34,3 +35,3 @@ -@@ -1869,8 +1869,8 @@ struct rte_eth_dev_info { - uint16_t max_rx_queues; /**< Maximum number of Rx queues. */ - uint16_t max_tx_queues; /**< Maximum number of Tx queues. */ +@@ -1241,8 +1241,8 @@ struct rte_eth_dev_info { + uint16_t max_rx_queues; /**< Maximum number of RX queues. */ + uint16_t max_tx_queues; /**< Maximum number of TX queues. */ @@ -43 +44 @@ - struct rte_eth_rxseg_capa rx_seg_capa; /**< Segmentation capability.*/ + uint64_t rx_offload_capa;