[SCSI] zfcp: Activate fc4s attributes for zfcp in FC transport class

Enable the display of supported and active fc4s for zfcp in the FC
transport class. zfcp only supports FCP, so simply hard-code this
information.  The zfcp hbaapi already has this information hardcoded,
but this would allow to switch from the coding in the zfcp hbaapi to
the common FC transport attributes in the future.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 3089a05c36a1112813fe8ab36f33bce06f91e5fa..482dcd97aa5dbfe1415db51c0a833a71e94ae65a 100644 (file)
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -495,6 +495,8 @@ static int zfcp_fsf_exchange_config_evaluate(struct zfcp_fsf_req *req)
        fc_host_port_id(shost) = ntoh24(bottom->s_id);
        fc_host_speed(shost) = bottom->fc_link_speed;
        fc_host_supported_classes(shost) = FC_COS_CLASS2 | FC_COS_CLASS3;
+       fc_host_supported_fc4s(shost)[2] = 1; /* FCP */
+       fc_host_active_fc4s(shost)[2] = 1; /* FCP */
 
        adapter->hydra_version = bottom->adapter_type;
        adapter->timer_ticks = bottom->timer_interval;

diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 3f1011663af56c8c09633fb433930214b98d666e..72bb9bcf735649d9597039533c5cdb547ba02532 100644 (file)
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -643,6 +643,7 @@ struct fc_function_template zfcp_transport_functions = {
        .show_host_port_name = 1,
        .show_host_permanent_port_name = 1,
        .show_host_supported_classes = 1,
+       .show_host_supported_fc4s = 1,
        .show_host_supported_speeds = 1,
        .show_host_maxframe_size = 1,
        .show_host_serial_number = 1,
@@ -652,6 +653,7 @@ struct fc_function_template zfcp_transport_functions = {
        .get_host_port_state = zfcp_get_host_port_state,
        .terminate_rport_io = zfcp_scsi_terminate_rport_io,
        .show_host_port_state = 1,
+       .show_host_active_fc4s = 1,
        .bsg_request = zfcp_fc_exec_bsg_job,
        /* no functions registered for following dynamic attributes but
           directly set by LLDD */