diff options
-rw-r--r-- | drivers/s390/scsi/zfcp_fsf.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 65455537cd52..9af2330f07a2 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
@@ -2036,21 +2036,21 @@ zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *fsf_req, int xchg_ok) | |||
2036 | min(FC_SERIAL_NUMBER_SIZE, 17)); | 2036 | min(FC_SERIAL_NUMBER_SIZE, 17)); |
2037 | } | 2037 | } |
2038 | 2038 | ||
2039 | ZFCP_LOG_NORMAL("The adapter %s reported the following " | 2039 | if (fsf_req->erp_action) |
2040 | "characteristics:\n" | 2040 | ZFCP_LOG_NORMAL("The adapter %s reported the following " |
2041 | "WWNN 0x%016Lx, " | 2041 | "characteristics:\n" |
2042 | "WWPN 0x%016Lx, " | 2042 | "WWNN 0x%016Lx, WWPN 0x%016Lx, " |
2043 | "S_ID 0x%06x,\n" | 2043 | "S_ID 0x%06x,\n" |
2044 | "adapter version 0x%x, " | 2044 | "adapter version 0x%x, " |
2045 | "LIC version 0x%x, " | 2045 | "LIC version 0x%x, " |
2046 | "FC link speed %d Gb/s\n", | 2046 | "FC link speed %d Gb/s\n", |
2047 | zfcp_get_busid_by_adapter(adapter), | 2047 | zfcp_get_busid_by_adapter(adapter), |
2048 | (wwn_t) fc_host_node_name(shost), | 2048 | (wwn_t) fc_host_node_name(shost), |
2049 | (wwn_t) fc_host_port_name(shost), | 2049 | (wwn_t) fc_host_port_name(shost), |
2050 | fc_host_port_id(shost), | 2050 | fc_host_port_id(shost), |
2051 | adapter->hydra_version, | 2051 | adapter->hydra_version, |
2052 | adapter->fsf_lic_version, | 2052 | adapter->fsf_lic_version, |
2053 | fc_host_speed(shost)); | 2053 | fc_host_speed(shost)); |
2054 | if (ZFCP_QTCB_VERSION < bottom->low_qtcb_version) { | 2054 | if (ZFCP_QTCB_VERSION < bottom->low_qtcb_version) { |
2055 | ZFCP_LOG_NORMAL("error: the adapter %s " | 2055 | ZFCP_LOG_NORMAL("error: the adapter %s " |
2056 | "only supports newer control block " | 2056 | "only supports newer control block " |
@@ -2115,8 +2115,10 @@ zfcp_fsf_exchange_config_data_handler(struct zfcp_fsf_req *fsf_req) | |||
2115 | zfcp_erp_adapter_shutdown(adapter, 0, 127, fsf_req); | 2115 | zfcp_erp_adapter_shutdown(adapter, 0, 127, fsf_req); |
2116 | return -EIO; | 2116 | return -EIO; |
2117 | case FC_PORTTYPE_NPORT: | 2117 | case FC_PORTTYPE_NPORT: |
2118 | ZFCP_LOG_NORMAL("Switched fabric fibrechannel " | 2118 | if (fsf_req->erp_action) |
2119 | "network detected at adapter %s.\n", | 2119 | ZFCP_LOG_NORMAL("Switched fabric fibrechannel " |
2120 | "network detected at adapter " | ||
2121 | "%s.\n", | ||
2120 | zfcp_get_busid_by_adapter(adapter)); | 2122 | zfcp_get_busid_by_adapter(adapter)); |
2121 | break; | 2123 | break; |
2122 | default: | 2124 | default: |