diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-09-13 11:45:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-09-13 11:45:18 +0000 |
| commit | b34e44c2aefdd578084f80084c5ad0566f74694f (patch) | |
| tree | 7a9d1e4ddfe18e6af0790b9d8fd8ee2255668f37 /usr/src/uts | |
| parent | 7bfe322ee94b337d8bc759f81b83d026f599b267 (diff) | |
| parent | 2ee1ed1ec5dfdf07d2c92db58b11f630de2a6e87 (diff) | |
| download | illumos-joyent-b34e44c2aefdd578084f80084c5ad0566f74694f.tar.gz | |
[illumos-gate merge]
commit 2ee1ed1ec5dfdf07d2c92db58b11f630de2a6e87
7388 Support -h <hostname> for ipadm DHCP (fix man lint)
commit b31320a79e2054c6739b5229259dbf98f3afc547
7388 Support -h <hostname> for ipadm DHCP
8517 Add ipadm and nwam options to allow designating a DHCP address as the primary interface
8518 Allow using system-generated IAID/DUID for all DHCPv4
8519 Add ns_name_pton2 to libresolv2 mapfile
commit c6e58d8c85cf3e5d0db157501b40276eb59edf16
8479 nvmeadm doesn't handle namespaces with EUI64
commit faeab80b5dcf1bc503f1f02494131eb0e6da46c3
8649 SD_RESET_THROTTLE_TIMEOUT is defined twice
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/common/netinet/dhcp.h | 10 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/scsi/targets/sddef.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr/src/uts/common/netinet/dhcp.h b/usr/src/uts/common/netinet/dhcp.h index 0cf5660af3..73b233ad33 100644 --- a/usr/src/uts/common/netinet/dhcp.h +++ b/usr/src/uts/common/netinet/dhcp.h @@ -22,6 +22,7 @@ /* * Copyright 1996-2003 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016, Chris Fraire <cfraire@me.com>. */ /* @@ -31,8 +32,6 @@ #ifndef _DHCP_H #define _DHCP_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -157,8 +156,15 @@ extern "C" { #define CD_SLPDA 78 #define CD_SLPSS 79 +#define CD_CLIENTFQDN 81 #define CD_AGENTOPT 82 + +/* + * Per RFC 3679, option 89 was "Never published as standard and [is] not in + * general use". See active CD_CLIENTFQDN and RFC 4702. + */ #define CD_FQDN 89 + #define CD_PXEARCHi 93 #define CD_PXENIIi 94 #define CD_PXECID 95 diff --git a/usr/src/uts/common/sys/scsi/targets/sddef.h b/usr/src/uts/common/sys/scsi/targets/sddef.h index a9c8c903da..da9f25c4ae 100644 --- a/usr/src/uts/common/sys/scsi/targets/sddef.h +++ b/usr/src/uts/common/sys/scsi/targets/sddef.h @@ -1752,12 +1752,6 @@ struct sd_fm_internal { #endif /* - * 60 seconds is what we will wait for to reset the - * throttle back to it SD_MAX_THROTTLE. - */ -#define SD_RESET_THROTTLE_TIMEOUT 60 - -/* * Number of times we'll retry a normal operation. * * This includes retries due to transport failure |