[SCSI] zfcp: evaluate plogi payload to set maxframe_size, supported_classes of rports

Signed-off-by: Ralph Wuerthner <rwuerthn@de.ibm.com>
Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 55785acf8709..6335f9229184 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -2560,8 +2560,7 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
                 if (!atomic_test_mask(ZFCP_STATUS_PORT_NO_WWPN, &port->status))
                 {
                         if (fsf_req->qtcb->bottom.support.els1_length <
-                            ((((unsigned long) &plogi->serv_param.wwpn) -
-                              ((unsigned long) plogi)) + sizeof (u64))) {
+                            sizeof (struct fsf_plogi)) {
                                 ZFCP_LOG_INFO(
                                         "warning: insufficient length of "
                                         "PLOGI payload (%i)\n",
@@ -2580,8 +2579,10 @@ zfcp_fsf_open_port_handler(struct zfcp_fsf_req *fsf_req)
                                         atomic_clear_mask(
                                                 ZFCP_STATUS_PORT_DID_DID,
                                                 &port->status);
-                                } else
+                                } else {
                                         port->wwnn = plogi->serv_param.wwnn;
+                                        zfcp_plogi_evaluate(port, plogi);
+                                }
                         }
                 }
                 break;