summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr/src/cmd/dlutil/Makefile5
-rw-r--r--usr/src/cmd/dlutil/dlled.c4
-rw-r--r--usr/src/pkg/manifests/system-kernel.man9e.inc2
-rw-r--r--usr/src/pkg/manifests/system-network.mf1
-rw-r--r--usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c4
-rw-r--r--usr/src/uts/common/io/dld/dld_drv.c1
-rw-r--r--usr/src/uts/common/io/e1000g/e1000g_main.c12
-rw-r--r--usr/src/uts/common/io/igb/igb_gld.c3
-rw-r--r--usr/src/uts/common/sys/mac_provider.h2
9 files changed, 23 insertions, 11 deletions
diff --git a/usr/src/cmd/dlutil/Makefile b/usr/src/cmd/dlutil/Makefile
index bbbb5220c4..4c7738ec3a 100644
--- a/usr/src/cmd/dlutil/Makefile
+++ b/usr/src/cmd/dlutil/Makefile
@@ -21,9 +21,10 @@ include ../Makefile.cmd
ROOTCMDDIR = $(ROOTLIB)/dl
CFLAGS += $(CCVERBOSE)
-dltraninfo := LDLIBS += -ldladm -lsff -lnvpair
-dltraninfo.ln := LDLIBS += -ldladm -lsff -lnvpair
+dltraninfo := LDLIBS += -ldladm -lsff -lnvpair
dlled := LDLIBS += -ldladm
+dltraninfo.ln := LDLIBS += -ldladm -lsff -lnvpair
+dlled.ln := LDLIBS += -ldladm
dlsend := LDLIBS += -ldlpi -lsocket -lmd
dlrecv := LDLIBS += -ldlpi
diff --git a/usr/src/cmd/dlutil/dlled.c b/usr/src/cmd/dlutil/dlled.c
index f6d6a7aab2..f919ef02e4 100644
--- a/usr/src/cmd/dlutil/dlled.c
+++ b/usr/src/cmd/dlutil/dlled.c
@@ -79,7 +79,7 @@ dlled_parse_mode(const char *orig)
mac_led_mode_t m = 0;
mode = strdup(orig);
- if (orig == NULL) {
+ if (mode == NULL) {
fprintf(stderr, "failed to allocate memory to dup led "
"mode: %s\n", strerror(errno));
exit(1);
@@ -268,7 +268,7 @@ main(int argc, char *argv[])
if ((status = dladm_name2info(dlled_hdl, argv[i],
&linkid, NULL, NULL, NULL)) != DLADM_STATUS_OK) {
(void) fprintf(stderr, "failed to get link "
- "id for link %s: %s\n", argv[i],
+ "id for link %s: %s\n", link,
dladm_status2str(status, dlled_dlerrmsg));
return (1);
}
diff --git a/usr/src/pkg/manifests/system-kernel.man9e.inc b/usr/src/pkg/manifests/system-kernel.man9e.inc
index b45d3cbabe..600a2bf7f9 100644
--- a/usr/src/pkg/manifests/system-kernel.man9e.inc
+++ b/usr/src/pkg/manifests/system-kernel.man9e.inc
@@ -37,6 +37,7 @@ file path=usr/share/man/man9e/ioctl.9e
file path=usr/share/man/man9e/ks_snapshot.9e
file path=usr/share/man/man9e/ks_update.9e
file path=usr/share/man/man9e/mac.9e
+file path=usr/share/man/man9e/mac_capab_led.9e
file path=usr/share/man/man9e/mac_capab_transceiver.9e
file path=usr/share/man/man9e/mc_getcapab.9e
file path=usr/share/man/man9e/mc_getprop.9e
@@ -95,6 +96,7 @@ link path=usr/share/man/man9e/gldv3.9e target=mac.9e
link path=usr/share/man/man9e/intro.9e target=Intro.9e
link path=usr/share/man/man9e/mc_close.9e target=mc_open.9e
link path=usr/share/man/man9e/mc_stop.9e target=mc_start.9e
+link path=usr/share/man/man9e/mcl_set.9e target=mac_capab_led.9e
link path=usr/share/man/man9e/mct_info.9e target=mac_capab_transceiver.9e
link path=usr/share/man/man9e/mct_read.9e target=mac_capab_transceiver.9e
link path=usr/share/man/man9e/tran_destroy_pkt.9e target=tran_init_pkt.9e
diff --git a/usr/src/pkg/manifests/system-network.mf b/usr/src/pkg/manifests/system-network.mf
index fd44515945..4f7a8978ff 100644
--- a/usr/src/pkg/manifests/system-network.mf
+++ b/usr/src/pkg/manifests/system-network.mf
@@ -83,6 +83,7 @@ file path=sbin/dlstat mode=0555
file path=sbin/flowadm mode=0555
file path=sbin/flowstat mode=0555
file path=sbin/ipadm mode=0555
+file path=usr/lib/dl/dlled mode=0555
file path=usr/lib/dl/dltraninfo mode=0555
file path=usr/share/man/man1m/dladm.1m
file path=usr/share/man/man1m/flowadm.1m
diff --git a/usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c b/usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c
index ff9e7418e7..0ec67c8d19 100644
--- a/usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c
+++ b/usr/src/uts/common/io/cxgbe/t4nex/t4_mac.c
@@ -788,7 +788,8 @@ t4_mc_transceiver_read(void *arg, uint_t id, uint_t page, void *bp,
struct adapter *sc = pi->adapter;
int rc;
size_t i, maxread;
- struct fw_ldst_cmd ldst;
+ /* LINTED: E_FUNC_VAR_UNUSED */
+ struct fw_ldst_cmd ldst __unused;
if (id != 0 || bp == NULL || nbytes == 0 || nread == NULL ||
(page != 0xa0 && page != 0xa2) || offset < 0)
@@ -876,6 +877,7 @@ t4_mc_getcapab(void *arg, mac_capab_t cap, void *data)
}
break;
}
+
case MAC_CAPAB_TRANSCEIVER:
mct = data;
diff --git a/usr/src/uts/common/io/dld/dld_drv.c b/usr/src/uts/common/io/dld/dld_drv.c
index 5541103d35..00b5f0e3de 100644
--- a/usr/src/uts/common/io/dld/dld_drv.c
+++ b/usr/src/uts/common/io/dld/dld_drv.c
@@ -1517,7 +1517,6 @@ done:
return (ret);
}
-
/*
* Note that ioctls that modify links have a NULL di_priv_func(), as
* privileges can only be checked after we know the class of the link being
diff --git a/usr/src/uts/common/io/e1000g/e1000g_main.c b/usr/src/uts/common/io/e1000g/e1000g_main.c
index 9561975dec..de4ebc2971 100644
--- a/usr/src/uts/common/io/e1000g/e1000g_main.c
+++ b/usr/src/uts/common/io/e1000g/e1000g_main.c
@@ -3161,7 +3161,6 @@ e1000g_led_blink(void *arg)
static int
e1000g_led_set(void *arg, mac_led_mode_t mode, uint_t flags)
{
- int ret;
e1000g_t *e1000g = arg;
if (flags != 0)
@@ -3175,7 +3174,8 @@ e1000g_led_set(void *arg, mac_led_mode_t mode, uint_t flags)
mutex_enter(&e1000g->e1000g_led_lock);
- if ((mode == MAC_LED_IDENT || mode == MAC_LED_OFF) &&
+ if ((mode == MAC_LED_IDENT || mode == MAC_LED_OFF ||
+ mode == MAC_LED_ON) &&
!e1000g->e1000g_led_setup) {
if (e1000_setup_led(&e1000g->shared) != E1000_SUCCESS) {
mutex_exit(&e1000g->e1000g_led_lock);
@@ -3199,7 +3199,7 @@ e1000g_led_set(void *arg, mac_led_mode_t mode, uint_t flags)
if (e1000_cleanup_led(&e1000g->shared) !=
E1000_SUCCESS) {
mutex_exit(&e1000g->e1000g_led_lock);
- return (ret);
+ return (EIO);
}
e1000g->e1000g_led_setup = B_FALSE;
}
@@ -3230,6 +3230,12 @@ e1000g_led_set(void *arg, mac_led_mode_t mode, uint_t flags)
return (EIO);
}
break;
+ case MAC_LED_ON:
+ if (e1000_led_on(&e1000g->shared) != E1000_SUCCESS) {
+ mutex_exit(&e1000g->e1000g_led_lock);
+ return (EIO);
+ }
+ break;
default:
mutex_exit(&e1000g->e1000g_led_lock);
return (ENOTSUP);
diff --git a/usr/src/uts/common/io/igb/igb_gld.c b/usr/src/uts/common/io/igb/igb_gld.c
index 88e2dcd94b..2bb4f99d6f 100644
--- a/usr/src/uts/common/io/igb/igb_gld.c
+++ b/usr/src/uts/common/io/igb/igb_gld.c
@@ -891,7 +891,6 @@ igb_fill_group(void *arg, mac_ring_type_t rtype, const int index,
static int
igb_led_set(void *arg, mac_led_mode_t mode, uint_t flags)
{
- int ret;
igb_t *igb = arg;
if (flags != 0)
@@ -914,7 +913,7 @@ igb_led_set(void *arg, mac_led_mode_t mode, uint_t flags)
case MAC_LED_DEFAULT:
if (igb->igb_led_setup) {
if (e1000_cleanup_led(&igb->hw) != E1000_SUCCESS)
- return (ret);
+ return (EIO);
igb->igb_led_setup = B_FALSE;
}
break;
diff --git a/usr/src/uts/common/sys/mac_provider.h b/usr/src/uts/common/sys/mac_provider.h
index 5d94a0d7d8..26f01ddb90 100644
--- a/usr/src/uts/common/sys/mac_provider.h
+++ b/usr/src/uts/common/sys/mac_provider.h
@@ -111,6 +111,8 @@ typedef enum {
MAC_CAPAB_OVERLAY = 0x00800000, /* boolean only, no data */
MAC_CAPAB_TRANSCEIVER = 0x01000000, /* mac_capab_transciever_t */
MAC_CAPAB_LED = 0x02000000, /* data is mac_capab_led_t */
+ MAC_CAPAB_TRANSCEIVER = 0x01000000, /* mac_capab_transciever_t */
+ MAC_CAPAB_LED = 0x02000000 /* data is mac_capab_led_t */
} mac_capab_t;
/*
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-01 09:59:01 +0000