1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index cd6f7c3cfe68..d620a8e8a614 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -538,6 +538,7 @@ qla2x00_rff_id(scsi_qla_host_t *ha)
         ct_req->req.rff_id.port_id[1] = ha->d_id.b.area;
         ct_req->req.rff_id.port_id[2] = ha->d_id.b.al_pa;
 
+        ct_req->req.rff_id.fc4_feature = BIT_1;
         ct_req->req.rff_id.fc4_type = 0x08;             /* SCSI - FCP */
 
         /* Execute MS IOCB */
@@ -1529,9 +1530,9 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
         eiter->type = __constant_cpu_to_be16(FDMI_PORT_SUPPORT_SPEED);
         eiter->len = __constant_cpu_to_be16(4 + 4);
         if (IS_QLA25XX(ha))
-                eiter->a.sup_speed = __constant_cpu_to_be32(4);
-        else if (IS_QLA24XX(ha))
                 eiter->a.sup_speed = __constant_cpu_to_be32(8);
+        else if (IS_QLA24XX(ha))
+                eiter->a.sup_speed = __constant_cpu_to_be32(4);
         else if (IS_QLA23XX(ha))
                 eiter->a.sup_speed = __constant_cpu_to_be32(2);
         else
@@ -1553,9 +1554,6 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *ha)
                 eiter->a.cur_speed = __constant_cpu_to_be32(2);
                 break;
         case 3:
-                eiter->a.cur_speed = __constant_cpu_to_be32(8);
-                break;
-        case 4:
                 eiter->a.cur_speed = __constant_cpu_to_be32(4);
                 break;
         }