diff options
| author | Ryan Zezeski <rpz@joyent.com> | 2019-01-18 15:43:50 -0700 |
|---|---|---|
| committer | Ryan Zezeski <rpz@joyent.com> | 2019-06-20 06:05:27 -0600 |
| commit | 87738edeea3a17bfc0f19c6e1c3a597f3970e943 (patch) | |
| tree | 8fa16e1e88ba990e21a5e03bdd7743459a6498dd /usr/src/cmd/dlmgmtd | |
| parent | 285d665c1bfb19b7a0d31074cbb554aae649ca56 (diff) | |
| download | illumos-joyent-87738edeea3a17bfc0f19c6e1c3a597f3970e943.tar.gz | |
OS-7520 OS-6778 broke IPv4 forwarding
OS-6878 mac_fix_cksum is incomplete
OS-7806 cannot move link from NGZ to GZ
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/cmd/dlmgmtd')
| -rw-r--r-- | usr/src/cmd/dlmgmtd/dlmgmt_door.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/usr/src/cmd/dlmgmtd/dlmgmt_door.c b/usr/src/cmd/dlmgmtd/dlmgmt_door.c index 2bebaa24c3..647b919864 100644 --- a/usr/src/cmd/dlmgmtd/dlmgmt_door.c +++ b/usr/src/cmd/dlmgmtd/dlmgmt_door.c @@ -21,7 +21,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2017 Joyent, Inc. + * Copyright 2019 Joyent, Inc. */ /* @@ -1248,21 +1248,6 @@ dlmgmt_setzoneid(void *argp, void *retp, size_t *sz, zoneid_t zoneid, } if (oldzoneid != GLOBAL_ZONEID) { - if (newzoneid == GLOBAL_ZONEID && linkp->ll_onloan) { - /* - * In this case we are attempting to assign a - * loaned datalink from an NGZ to the GZ. We - * can only reassign a loaned VNIC back to the - * GZ when the zone is shutting down -- - * because otherwise the VNIC is in use by the - * zone and will be busy. Leave the VNIC - * loaned to the zone and return EBUSY to the - * caller. - */ - err = EBUSY; - goto done; - } - if (zone_remove_datalink(oldzoneid, linkid) != 0) { err = errno; dlmgmt_log(LOG_WARNING, "unable to remove link %d from " @@ -1272,6 +1257,7 @@ dlmgmt_setzoneid(void *argp, void *retp, size_t *sz, zoneid_t zoneid, linkp->ll_onloan = B_FALSE; } + if (newzoneid != GLOBAL_ZONEID) { if (zone_add_datalink(newzoneid, linkid) != 0) { err = errno; |