diff options
| author | Cathy Zhou <Cathy.Zhou@Sun.COM> | 2008-09-16 16:00:17 -0700 |
|---|---|---|
| committer | Cathy Zhou <Cathy.Zhou@Sun.COM> | 2008-09-16 16:00:17 -0700 |
| commit | 8a1c9a22c1cc2406c999faa427ec0157a40da94a (patch) | |
| tree | 24c950b9238d07d11d0647c39ee0e7e8ac4494af /usr/src/cmd/dlmgmtd | |
| parent | 4f10d6de4eaf8568195df6a921d12810040e03d9 (diff) | |
| download | illumos-joyent-8a1c9a22c1cc2406c999faa427ec0157a40da94a.tar.gz | |
6729436 dlmgmtd needlessly writes to datalink.conf
6740850 dlmgmt_post_sysevent failed when try to plumb 4000 vlan interfaces
Diffstat (limited to 'usr/src/cmd/dlmgmtd')
| -rw-r--r-- | usr/src/cmd/dlmgmtd/dlmgmt_door.c | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_door.c b/usr/src/cmd/dlmgmtd/dlmgmt_door.c index fc50b5c5b1..2374047078 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_door.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_door.c @@ -108,7 +108,7 @@ dlmgmt_upcall_create(void *argp, void *retp) dlmgmt_link_t *linkp; char link[MAXLINKNAMELEN]; uint32_t flags; - int err; + int err = 0; boolean_t created = B_FALSE; /* @@ -131,6 +131,18 @@ dlmgmt_upcall_create(void *argp, void *retp) */ if ((class == DATALINK_CLASS_PHYS) && (linkp = dlmgmt_getlink_by_dev(create->ld_devname)) != NULL) { + + if (linkattr_equal(&(linkp->ll_head), FPHYMAJ, + &create->ld_phymaj, sizeof (uint64_t)) && + linkattr_equal(&(linkp->ll_head), FPHYINST, + &create->ld_phyinst, sizeof (uint64_t)) && + (linkp->ll_flags & flags) == flags) { + /* + * If nothing has been changed, directly return. + */ + goto noupdate; + } + err = linkattr_set(&(linkp->ll_head), FPHYMAJ, &create->ld_phymaj, sizeof (uint64_t), DLADM_TYPE_UINT64); if (err != 0) @@ -184,7 +196,6 @@ dlmgmt_upcall_create(void *argp, void *retp) ((err = linkattr_set(&linkp->ll_head, FPHYINST, &create->ld_phyinst, sizeof (uint64_t), DLADM_TYPE_UINT64)) != 0))) { (void) dlmgmt_destroy_common(linkp, flags); - goto done; } done: @@ -193,12 +204,13 @@ done: (void) dlmgmt_destroy_common(linkp, flags); } +noupdate: if (err == 0) retvalp->lr_linkid = linkp->ll_linkid; dlmgmt_table_unlock(); - if (err == 0) { + if ((err == 0) && (class == DATALINK_CLASS_PHYS)) { /* * Post the ESC_DATALINK_PHYS_ADD sysevent. This sysevent * is consumed by the datalink sysevent module which in @@ -268,10 +280,11 @@ dlmgmt_upcall_update(void *argp, void *retp) goto done; } - linkp->ll_media = media; - linkp->ll_gen++; - - (void) dlmgmt_write_db_entry(linkp->ll_linkid, linkp->ll_flags); + if (linkp->ll_media != media) { + linkp->ll_media = media; + linkp->ll_gen++; + (void) dlmgmt_write_db_entry(linkp->ll_linkid, linkp->ll_flags); + } done: dlmgmt_table_unlock(); |