diff options
| author | Sowmini Varadhan <Sowmini.Varadhan@Sun.COM> | 2009-07-28 12:45:46 -0400 |
|---|---|---|
| committer | Sowmini Varadhan <Sowmini.Varadhan@Sun.COM> | 2009-07-28 12:45:46 -0400 |
| commit | 0b8f054691a3974b7c86dd2700ecbf6108a2d55e (patch) | |
| tree | 9971ce74b88348725505d0ef60ae040eb027ad3c /usr/src/cmd | |
| parent | 96f82fef09bdebba70a409640c49772b1cdf1a2a (diff) | |
| download | illumos-joyent-0b8f054691a3974b7c86dd2700ecbf6108a2d55e.tar.gz | |
6691666 link property persistence for wifi drivers
6851294 dladm reset-linkprop whines about read-only properties
6856864 auto-negotiation default values should not be hard-coded in libdladm
Diffstat (limited to 'usr/src/cmd')
| -rw-r--r-- | usr/src/cmd/cmd-inet/lib/nwamd/interface.c | 2 | ||||
| -rw-r--r-- | usr/src/cmd/dladm/dladm.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/dlmgmtd/dlmgmt_door.c | 5 | ||||
| -rw-r--r-- | usr/src/cmd/svc/milestone/net-physical | 11 |
4 files changed, 4 insertions, 18 deletions
diff --git a/usr/src/cmd/cmd-inet/lib/nwamd/interface.c b/usr/src/cmd/cmd-inet/lib/nwamd/interface.c index e4e57156d7..8a12f27848 100644 --- a/usr/src/cmd/cmd-inet/lib/nwamd/interface.c +++ b/usr/src/cmd/cmd-inet/lib/nwamd/interface.c @@ -1108,8 +1108,6 @@ initialize_interfaces(void) wait_time = NWAM_IF_WAIT_DELTA_MAX; } - (void) dladm_init_linkprop(dld_handle, DATALINK_ALL_LINKID, B_FALSE); - (void) icfg_iterate_if(AF_INET, ICFG_PLUMBED, NULL, do_add_interface); print_interface_list(); diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c index e69aeb8315..c20685154b 100644 --- a/usr/src/cmd/dladm/dladm.c +++ b/usr/src/cmd/dladm/dladm.c @@ -5878,7 +5878,9 @@ reset_one_linkprop(dladm_handle_t dh, datalink_id_t linkid, status = dladm_set_linkprop(dh, linkid, propname, NULL, 0, DLADM_OPT_ACTIVE); - if (status != DLADM_STATUS_OK) { + if (status != DLADM_STATUS_OK && + status != DLADM_STATUS_PROPRDONLY && + status != DLADM_STATUS_NOTSUP) { warn_dlerr(status, "cannot reset link property '%s' on '%s'", propname, statep->ls_name); } diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_door.c b/usr/src/cmd/dlmgmtd/dlmgmt_door.c index 68bfa82719..e73f4841b6 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_door.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_door.c @@ -945,7 +945,6 @@ dlmgmt_upcall_linkprop_init(void *argp, void *retp) { dlmgmt_door_linkprop_init_t *lip = argp; dlmgmt_linkprop_init_retval_t *retvalp = retp; - dlmgmt_link_t *linkp; boolean_t do_linkprop = B_FALSE; /* @@ -955,10 +954,8 @@ dlmgmt_upcall_linkprop_init(void *argp, void *retp) * not the DLD control device. */ dlmgmt_table_lock(B_FALSE); - if ((linkp = link_by_id(lip->ld_linkid)) == NULL) + if (link_by_id(lip->ld_linkid) == NULL) retvalp->lr_err = ENOENT; - else if (linkp->ll_media == DL_WIFI) - retvalp->lr_err = 0; else do_linkprop = B_TRUE; dlmgmt_table_unlock(); diff --git a/usr/src/cmd/svc/milestone/net-physical b/usr/src/cmd/svc/milestone/net-physical index 1248517740..15b91edc9d 100644 --- a/usr/src/cmd/svc/milestone/net-physical +++ b/usr/src/cmd/svc/milestone/net-physical @@ -245,17 +245,6 @@ if [ -n "$ipmp6_list" ]; then "$ipmp6_failed" fi -if smf_is_globalzone; then - # - # Wifi drivers use special property interfaces that are not supported - # by the existing property persistence mechanism, so if a wifi driver - # unloads and then is subsequently reloaded, associated links' properties - # will not be restored. For now, wait until after interfaces have been - # plumbed (above) to initialize link properties. - # - /sbin/dladm init-linkprop -w -fi - # # Process the /etc/hostname[6].* files for IPMP interfaces. Processing these # before non-IPMP interfaces avoids accidental implicit IPMP group creation. |