1 files changed, 28 insertions, 7 deletions

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index f09c863dc6bd..4e41baa0c141 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1058,14 +1058,28 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req,
         bytes = zfcp_qdio_sbals_from_sg(adapter->qdio, &req->queue_req,
                                         SBAL_FLAGS0_TYPE_WRITE_READ,
                                         sg_resp, max_sbals);
+        req->qtcb->bottom.support.resp_buf_length = bytes;
         if (bytes <= 0)
                 return -EIO;
 
+        return 0;
+}
+
+static int zfcp_fsf_setup_ct_els(struct zfcp_fsf_req *req,
+                                 struct scatterlist *sg_req,
+                                 struct scatterlist *sg_resp,
+                                 int max_sbals)
+{
+        int ret;
+
+        ret = zfcp_fsf_setup_ct_els_sbals(req, sg_req, sg_resp, max_sbals);
+        if (ret)
+                return ret;
+
         /* common settings for ct/gs and els requests */
-        req->qtcb->bottom.support.resp_buf_length = bytes;
         req->qtcb->bottom.support.service_class = FSF_CLASS_3;
         req->qtcb->bottom.support.timeout = 2 * R_A_TOV;
-        zfcp_fsf_start_timer(req, 2 * R_A_TOV + 10);
+        zfcp_fsf_start_timer(req, (2 * R_A_TOV + 10) * HZ);
 
         return 0;
 }
@@ -1094,8 +1108,8 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool)
         }
 
         req->status |= ZFCP_STATUS_FSFREQ_CLEANUP;
-        ret = zfcp_fsf_setup_ct_els_sbals(req, ct->req, ct->resp,
-                                          FSF_MAX_SBALS_PER_REQ);
+        ret = zfcp_fsf_setup_ct_els(req, ct->req, ct->resp,
+                                    FSF_MAX_SBALS_PER_REQ);
         if (ret)
                 goto failed_send;
 
@@ -1192,7 +1206,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els)
         }
 
         req->status |= ZFCP_STATUS_FSFREQ_CLEANUP;
-        ret = zfcp_fsf_setup_ct_els_sbals(req, els->req, els->resp, 2);
+        ret = zfcp_fsf_setup_ct_els(req, els->req, els->resp, 2);
 
         if (ret)
                 goto failed_send;
@@ -1461,9 +1475,16 @@ static void zfcp_fsf_open_port_handler(struct zfcp_fsf_req *req)
                 plogi = (struct fsf_plogi *) req->qtcb->bottom.support.els;
                 if (req->qtcb->bottom.support.els1_length >=
                     FSF_PLOGI_MIN_LEN) {
-                        if (plogi->serv_param.wwpn != port->wwpn)
+                        if (plogi->serv_param.wwpn != port->wwpn) {
                                 port->d_id = 0;
-                        else {
+                                dev_warn(&port->adapter->ccw_device->dev,
+                                         "A port opened with WWPN 0x%016Lx "
+                                         "returned data that identifies it as "
+                                         "WWPN 0x%016Lx\n",
+                                         (unsigned long long) port->wwpn,
+                                         (unsigned long long)
+                                          plogi->serv_param.wwpn);
+                        } else {
                                 port->wwnn = plogi->serv_param.wwnn;
                                 zfcp_fc_plogi_evaluate(port, plogi);
                         }