handle NIC names longer than 7 characters

This commit is contained in:
xu_lei_123 2022-12-29 21:46:04 +08:00
parent c145537d6f
commit eb13138870
2 changed files with 38 additions and 2 deletions

View File

@ -0,0 +1,33 @@
From 74359e5a9965ed26e0b42d890bf802103da6c97f Mon Sep 17 00:00:00 2001
From: xulei <xulei@xfusion.com>
Date: Thu, 29 Dec 2022 20:07:41 +0800
Subject: [PATCH] handle NIC names longer than 7 characters
---
fcoeadm_display.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fcoeadm_display.c b/fcoeadm_display.c
index cc8f4fe..585ecfa 100644
--- a/fcoeadm_display.c
+++ b/fcoeadm_display.c
@@ -476,7 +476,7 @@ static void scan_device_map(char *rport, enum disp_style style)
static void show_port_stats_header(const char *ifname, int interval)
{
printf("\n");
- printf("%-7s interval: %-2d Err Inv "
+ printf("%-15s interval: %-2d Err Inv "
"IvTx Link Cntl Input Input Output Output\n",
ifname, interval);
printf("Seconds TxFrames TxBytes RxFrames RxBytes "
@@ -921,7 +921,7 @@ static void
print_interface_fcoe_lesb_stats_header(const char *ifname, int interval)
{
printf("\n");
- printf("%-7s interval: %-2d\n", ifname, interval);
+ printf("%-15s interval: %-2d\n", ifname, interval);
printf("LinkFail VLinkFail MissFKA SymbErr ErrBlkCnt FCSErrCnt\n");
printf("-------- --------- ------- ------- --------- ---------\n");
}
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: fcoe-utils
Version: 1.0.33
Release: 3
Release: 4
Summary: Fibre Channel over Ethernet utilities
License: GPLv2
URL: https://github.com/morbidrsa/fcoe-utils
@ -12,7 +12,7 @@ Patch2: backport-02-string_op_truncation_format_trauncation.patch
Patch3: backport-03-use-of-uninitialized-values-detected-during-LTO.patch
#This patch refer to ubuntu's version
Patch4: backport-Fix-build-error-to-change-char-type.patch
Patch5: backport-handle-NIC-names-longer-than-7-characters.patch
BuildRequires: autoconf automake libpciaccess-devel libtool lldpad-devel systemd
Requires: lldpad iproute device-mapper-multipath
%{?systemd_requires}
@ -67,6 +67,9 @@ done
%{_mandir}/man8/*
%changelog
* Thu Dec 29 2022 xulei <xulei@xfusion.com> - 1.0.33-4
- Backport upstream patch to handle NIC names lognger than 7 characters
* Wed Mar 03 2022 xu_ping <xuping33@huawei.com> - 1.0.33-3
- Backport upstream patch to avoid non-X86 build break.