diff options
| -rw-r--r-- | usr/src/uts/common/io/comstar/port/fct/fct.c | 22 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/fct.h | 3 |
2 files changed, 15 insertions, 10 deletions
diff --git a/usr/src/uts/common/io/comstar/port/fct/fct.c b/usr/src/uts/common/io/comstar/port/fct/fct.c index 52092e324b..cdb8a00aa3 100644 --- a/usr/src/uts/common/io/comstar/port/fct/fct.c +++ b/usr/src/uts/common/io/comstar/port/fct/fct.c @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. + * Copyright 2016 Nexenta Systems, Inc. All rights reserved. */ #include <sys/conf.h> @@ -480,6 +480,8 @@ fct_get_adapter_port_attr(fct_i_local_port_t *ilport, uint8_t *pwwn, port_attr->PortSupportedSpeed |= FC_HBA_PORTSPEED_8GBIT; if (attr->supported_speed & PORT_SPEED_10G) port_attr->PortSupportedSpeed |= FC_HBA_PORTSPEED_10GBIT; + if (attr->supported_speed & PORT_SPEED_16G) + port_attr->PortSupportedSpeed |= FC_HBA_PORTSPEED_16GBIT; switch (iport->iport_link_info.port_speed) { case PORT_SPEED_1G: port_attr->PortSpeed = FC_HBA_PORTSPEED_1GBIT; @@ -496,6 +498,9 @@ fct_get_adapter_port_attr(fct_i_local_port_t *ilport, uint8_t *pwwn, case PORT_SPEED_10G: port_attr->PortSpeed = FC_HBA_PORTSPEED_10GBIT; break; + case PORT_SPEED_16G: + port_attr->PortSpeed = FC_HBA_PORTSPEED_16GBIT; + break; default: port_attr->PortSpeed = FC_HBA_PORTSPEED_UNKNOWN; break; @@ -1358,7 +1363,7 @@ fct_deregport_fail1:; /* ARGSUSED */ void fct_handle_event(fct_local_port_t *port, int event_id, uint32_t event_flags, - caddr_t arg) + caddr_t arg) { char info[FCT_INFO_LEN]; fct_i_event_t *e; @@ -1607,8 +1612,7 @@ fct_local_port_cleanup_done(fct_i_local_port_t *iport) fct_cmd_t * fct_scsi_task_alloc(fct_local_port_t *port, uint16_t rp_handle, - uint32_t rportid, uint8_t *lun, uint16_t cdb_length, - uint16_t task_ext) + uint32_t rportid, uint8_t *lun, uint16_t cdb_length, uint16_t task_ext) { fct_cmd_t *cmd; fct_i_cmd_t *icmd; @@ -2137,7 +2141,7 @@ fct_cmd_free(fct_cmd_t *cmd) /* ARGSUSED */ stmf_status_t fct_scsi_abort(stmf_local_port_t *lport, int abort_cmd, void *arg, - uint32_t flags) + uint32_t flags) { stmf_status_t ret = STMF_SUCCESS; scsi_task_t *task; @@ -2272,7 +2276,7 @@ fct_ctl(struct stmf_local_port *lport, int cmd, void *arg) /* ARGSUSED */ stmf_status_t fct_info(uint32_t cmd, stmf_local_port_t *lport, void *arg, uint8_t *buf, - uint32_t *bufsizep) + uint32_t *bufsizep) { return (STMF_NOT_SUPPORTED); } @@ -3038,7 +3042,7 @@ fct_queue_cmd_for_termination(fct_cmd_t *cmd, fct_status_t s) */ void fct_q_for_termination_lock_held(fct_i_local_port_t *iport, fct_i_cmd_t *icmd, - fct_status_t s) + fct_status_t s) { uint32_t old, new; fct_i_cmd_t **ppicmd; @@ -3203,7 +3207,7 @@ fct_handle_port_offline(fct_i_local_port_t *iport) */ fct_status_t fct_port_initialize(fct_local_port_t *port, uint32_t rflags, - char *additional_info) + char *additional_info) { stmf_state_change_info_t st; @@ -3216,7 +3220,7 @@ fct_port_initialize(fct_local_port_t *port, uint32_t rflags, fct_status_t fct_port_shutdown(fct_local_port_t *port, uint32_t rflags, - char *additional_info) + char *additional_info) { stmf_state_change_info_t st; diff --git a/usr/src/uts/common/sys/fct.h b/usr/src/uts/common/sys/fct.h index 0b6774c6da..0bc201dc89 100644 --- a/usr/src/uts/common/sys/fct.h +++ b/usr/src/uts/common/sys/fct.h @@ -20,7 +20,7 @@ */ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. + * Copyright 2016 Nexenta Systems, Inc. All rights reserved. */ #ifndef _FCT_H #define _FCT_H @@ -336,6 +336,7 @@ typedef struct fct_port_stat { #define PORT_SPEED_4G 4 #define PORT_SPEED_8G 8 #define PORT_SPEED_10G 16 +#define PORT_SPEED_16G 32 /* * Abort commands |