From 362e2527340f00e3c9fd6390c55a33ade796d225 Mon Sep 17 00:00:00 2001 From: yangl777 Date: Fri, 22 Mar 2024 07:28:44 +0000 Subject: [PATCH] netlink:fix typo (cherry picked from commit 05fab4d1ae3b0c8c15983a8b28cebce22fbbfd45) --- ethtool.spec | 10 +++++++++- netlink-fix-typo.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 netlink-fix-typo.patch diff --git a/ethtool.spec b/ethtool.spec index 50d478c..93951c3 100644 --- a/ethtool.spec +++ b/ethtool.spec @@ -1,12 +1,14 @@ Name: ethtool Epoch: 2 Version: 6.6 -Release: 1 +Release: 2 Summary: Settings tool for Ethernet NICs License: GPL-2.0-only AND GPL-2.0-or-later URL: https://www.kernel.org/pub/software/network/ethtool Source0: https://www.kernel.org/pub/software/network/%{name}/%{name}-%{version}.tar.xz +Patch0: netlink-fix-typo.patch + BuildRequires: gcc BuildRequires: libmnl-devel Conflicts: filesystem < 3 @@ -53,6 +55,12 @@ make check %{_mandir}/man8/%{name}.8* %changelog +* Fri Mar 22 2024 yanglu - 2:6.6-2 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:fix typo + * Thu Dec 28 2023 yanglu - 2:6.6-1 - Type:requirement - Id:NA diff --git a/netlink-fix-typo.patch b/netlink-fix-typo.patch new file mode 100644 index 0000000..8314b44 --- /dev/null +++ b/netlink-fix-typo.patch @@ -0,0 +1,31 @@ +From 41207be299f9607fa834762e8c9112d07cd06b76 Mon Sep 17 00:00:00 2001 +From: gaoxingwang +Date: Fri, 22 Mar 2024 15:01:43 +0800 +Subject: [PATCH] netlink: fix typo + +Add missing colon in coalesce_reply_cb + +Fixes: ec573f209d (netlink: settings: add netlink support for coalesce tx aggr params) +Signed-off-by: gaoxingwang + +Signed-off-by: gaoxingwang +--- + netlink/coalesce.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/netlink/coalesce.c b/netlink/coalesce.c +index bc34d3d..bb93f9b 100644 +--- a/netlink/coalesce.c ++++ b/netlink/coalesce.c +@@ -93,7 +93,7 @@ int coalesce_reply_cb(const struct nlmsghdr *nlhdr, void *data) + tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES]); + show_u32("tx-aggr-max-frames", "tx-aggr-max-frames:\t", + tb[ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES]); +- show_u32("tx-aggr-time-usecs", "tx-aggr-time-usecs\t", ++ show_u32("tx-aggr-time-usecs", "tx-aggr-time-usecs:\t", + tb[ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS]); + show_cr(); + +-- +2.27.0 + -- Gitee