diff options
| author | Sowmini Varadhan <Sowmini.Varadhan@Sun.COM> | 2008-10-04 07:58:50 -0400 |
|---|---|---|
| committer | Sowmini Varadhan <Sowmini.Varadhan@Sun.COM> | 2008-10-04 07:58:50 -0400 |
| commit | 149b7eb2919570a01d698963b7ab14d45b4edda8 (patch) | |
| tree | 1cbd4745b5b09c9f3afefd517252da8170858e19 /usr/src/lib/libdladm | |
| parent | ff4f37703f8a206f433d63190b03c04326b6d293 (diff) | |
| download | illumos-joyent-149b7eb2919570a01d698963b7ab14d45b4edda8.tar.gz | |
6753521 show-linkprop should not return ENOTSUP for DEFAULT value of props like speed.
6748230 gldv3_warning should initialize cnt when calling dladm_get_linkprop
Diffstat (limited to 'usr/src/lib/libdladm')
| -rw-r--r-- | usr/src/lib/libdladm/common/libdladm.h | 5 | ||||
| -rw-r--r-- | usr/src/lib/libdladm/common/linkprop.c | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/usr/src/lib/libdladm/common/libdladm.h b/usr/src/lib/libdladm/common/libdladm.h index a7077f5900..df69a54615 100644 --- a/usr/src/lib/libdladm/common/libdladm.h +++ b/usr/src/lib/libdladm/common/libdladm.h @@ -26,8 +26,6 @@ #ifndef _LIBDLADM_H #define _LIBDLADM_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/dls.h> #include <sys/dlpi.h> @@ -100,7 +98,8 @@ typedef enum { DLADM_STATUS_LINKBUSY, DLADM_STATUS_VIDINVAL, DLADM_STATUS_NONOTIF, - DLADM_STATUS_TRYAGAIN + DLADM_STATUS_TRYAGAIN, + DLADM_STATUS_NOTDEFINED } dladm_status_t; typedef enum { diff --git a/usr/src/lib/libdladm/common/linkprop.c b/usr/src/lib/libdladm/common/linkprop.c index dd43d9331b..d82be99c71 100644 --- a/usr/src/lib/libdladm/common/linkprop.c +++ b/usr/src/lib/libdladm/common/linkprop.c @@ -1188,7 +1188,7 @@ do_get_autopush(struct prop_desc *pd, datalink_id_t linkid, dld_ioc_macprop_t *dip; if (flags & MAC_PROP_DEFAULT) - return (DLADM_STATUS_NOTSUP); + return (DLADM_STATUS_NOTDEFINED); *val_cnt = 1; dip = i_dladm_get_public_prop(linkid, pd->pd_name, flags, &status); @@ -1912,9 +1912,6 @@ i_dladm_duplex_get(struct prop_desc *pd, datalink_id_t linkid, link_duplex_t link_duplex; dladm_status_t status; - if (flags & MAC_PROP_DEFAULT) - return (DLADM_STATUS_NOTSUP); - if ((status = dladm_get_single_mac_stat(linkid, "link_duplex", KSTAT_DATA_UINT32, &link_duplex)) != 0) return (status); @@ -1942,9 +1939,6 @@ i_dladm_speed_get(struct prop_desc *pd, datalink_id_t linkid, uint64_t ifspeed = 0; dladm_status_t status; - if (flags & MAC_PROP_DEFAULT) - return (DLADM_STATUS_NOTSUP); - if ((status = dladm_get_single_mac_stat(linkid, "ifspeed", KSTAT_DATA_UINT64, &ifspeed)) != 0) return (status); @@ -1970,8 +1964,6 @@ i_dladm_status_get(struct prop_desc *pd, datalink_id_t linkid, uchar_t *cp; dld_ioc_macprop_t *dip; - if (flags & MAC_PROP_DEFAULT) - return (DLADM_STATUS_NOTSUP); dip = i_dladm_get_public_prop(linkid, pd->pd_name, flags, &status); if (status != DLADM_STATUS_OK) return (status); |