summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2021-07-01 18:55:00 -0400
committerGarrett D'Amore <garrett@damore.org>2022-06-29 13:45:45 -0400
commit08848a83914f59a64a6b5a37f068bbb69b0604b0 (patch)
tree8a40fa184819c72cf5e8df4a9e88a0655e200c5e
parent99e2a6f8e952fd927a72b75323d3e56bcbcda40a (diff)
downloadillumos-joyent-08848a83914f59a64a6b5a37f068bbb69b0604b0.tar.gz
13919 dladm show-vnic truncates link speed for 100Gbps
Reviewed by: Jason King <jason.brian.king+illumos@gmail.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Evan Layton <elayton@tintri.com> Approved by: Robert Mustacchi <rm@fingolfin.org>
-rw-r--r--usr/src/cmd/dladm/dladm.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c
index e905111aea..f44a0083d4 100644
--- a/usr/src/cmd/dladm/dladm.c
+++ b/usr/src/cmd/dladm/dladm.c
@@ -25,6 +25,7 @@
* Copyright (c) 2015 Joyent, Inc. All rights reserved.
* Copyright 2020 Peter Tribble.
* Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+ * Copyright 2021 RackTop Systems, Inc.
*/
#include <stdio.h>
@@ -784,9 +785,9 @@ static const ofmt_field_t aggr_x_fields[] = {
/* name, field width, index callback */
{ "LINK", 12, AGGR_X_LINK, print_xaggr_cb},
{ "PORT", 15, AGGR_X_PORT, print_xaggr_cb},
-{ "SPEED", 5, AGGR_X_SPEED, print_xaggr_cb},
-{ "DUPLEX", 10, AGGR_X_DUPLEX, print_xaggr_cb},
-{ "STATE", 10, AGGR_X_STATE, print_xaggr_cb},
+{ "SPEED", 9, AGGR_X_SPEED, print_xaggr_cb},
+{ "DUPLEX", 9, AGGR_X_DUPLEX, print_xaggr_cb},
+{ "STATE", 9, AGGR_X_STATE, print_xaggr_cb},
{ "ADDRESS", 19, AGGR_X_ADDRESS, print_xaggr_cb},
{ "PORTSTATE", 16, AGGR_X_PORTSTATE, print_xaggr_cb},
{ NULL, 0, 0, NULL}}
@@ -857,9 +858,9 @@ static const ofmt_field_t phys_fields[] = {
offsetof(link_fields_buf_t, link_phys_media), print_default_cb},
{ "STATE", 11,
offsetof(link_fields_buf_t, link_phys_state), print_default_cb},
-{ "SPEED", 7,
+{ "SPEED", 9,
offsetof(link_fields_buf_t, link_phys_speed), print_default_cb},
-{ "DUPLEX", 10,
+{ "DUPLEX", 9,
offsetof(link_fields_buf_t, link_phys_duplex), print_default_cb},
{ "DEVICE", 13,
offsetof(link_fields_buf_t, link_phys_device), print_default_cb},
@@ -1038,7 +1039,7 @@ typedef struct vnic_fields_buf_s
{
char vnic_link[DLPI_LINKNAME_MAX];
char vnic_over[DLPI_LINKNAME_MAX];
- char vnic_speed[6];
+ char vnic_speed[10];
char vnic_macaddr[18];
char vnic_macaddrtype[19];
char vnic_vid[6];
@@ -1049,7 +1050,7 @@ static const ofmt_field_t vnic_fields[] = {
offsetof(vnic_fields_buf_t, vnic_link), print_default_cb},
{ "OVER", 13,
offsetof(vnic_fields_buf_t, vnic_over), print_default_cb},
-{ "SPEED", 7,
+{ "SPEED", 9,
offsetof(vnic_fields_buf_t, vnic_speed), print_default_cb},
{ "MACADDRESS", 18,
offsetof(vnic_fields_buf_t, vnic_macaddr), print_default_cb},