diff options
| author | Cathy Zhou <Cathy.Zhou@Sun.COM> | 2010-07-14 15:39:08 -0400 |
|---|---|---|
| committer | Cathy Zhou <Cathy.Zhou@Sun.COM> | 2010-07-14 15:39:08 -0400 |
| commit | 327151705b7439cb7ab35c370f682cac7ef9523a (patch) | |
| tree | dc70b1e9458066faef68e56f0be54073920c112c /usr/src/lib/libdladm/common/libdlvnic.c | |
| parent | 442384bb4f40e4893df0a79549264f04218e1d9f (diff) | |
| download | illumos-joyent-327151705b7439cb7ab35c370f682cac7ef9523a.tar.gz | |
6953249 memory leak in dlmgmtd
6949971 dlmgmtd keeps consuming memory
6826131 dlmgmtd's parse_linkprops() suffers from memory mismanagement
6846855 vlan rcm support could use a code review
Diffstat (limited to 'usr/src/lib/libdladm/common/libdlvnic.c')
| -rw-r--r-- | usr/src/lib/libdladm/common/libdlvnic.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/lib/libdladm/common/libdlvnic.c b/usr/src/lib/libdladm/common/libdlvnic.c index 7ff9563e1a..6dba8d6fad 100644 --- a/usr/src/lib/libdladm/common/libdlvnic.c +++ b/usr/src/lib/libdladm/common/libdlvnic.c @@ -19,8 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. */ #include <stdio.h> @@ -199,7 +198,7 @@ i_dladm_vnic_info_persist(dladm_handle_t handle, datalink_id_t linkid, datalink_class_t class; attrp->va_vnic_id = linkid; - if ((status = dladm_read_conf(handle, linkid, &conf)) != + if ((status = dladm_getsnap_conf(handle, linkid, &conf)) != DLADM_STATUS_OK) return (status); @@ -279,7 +278,6 @@ i_dladm_vnic_info_persist(dladm_handle_t handle, datalink_id_t linkid, sizeof (u64)); attrp->va_vid = ((status == DLADM_STATUS_OK) ? (uint16_t)u64 : 0); - status = DLADM_STATUS_OK; done: dladm_destroy_conf(handle, conf); @@ -663,7 +661,7 @@ static dladm_status_t dladm_vnic_persist_conf(dladm_handle_t handle, const char *name, dladm_vnic_attr_t *attrp, datalink_class_t class) { - dladm_conf_t conf = DLADM_INVALID_CONF; + dladm_conf_t conf; dladm_status_t status; char macstr[ETHERADDRL * 3]; char linkover[MAXLINKNAMELEN]; |