1 files changed, 8 insertions, 53 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 8220e7b9799b..987c5b0ca78e 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -1,6 +1,6 @@
 /*
  * QLogic Fibre Channel HBA Driver
- * Copyright (c)  2003-2008 QLogic Corporation
+ * Copyright (c)  2003-2010 QLogic Corporation
  *
  * See LICENSE.qla2xxx for copyright and licensing details.
  */
@@ -136,7 +136,8 @@ qla24xx_enable_vp(scsi_qla_host_t *vha)
 
         /* Check if physical ha port is Up */
         if (atomic_read(&base_vha->loop_state) == LOOP_DOWN  ||
-                atomic_read(&base_vha->loop_state) == LOOP_DEAD) {
+                atomic_read(&base_vha->loop_state) == LOOP_DEAD ||
+                !(ha->current_topology & ISP_CFG_F)) {
                 vha->vp_err_state =  VP_ERR_PORTDWN;
                 fc_vport_set_state(vha->fc_vport, FC_VPORT_LINKDOWN);
                 goto enable_failed;
@@ -398,7 +399,10 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
         host->can_queue = base_vha->req->length + 128;
         host->this_id = 255;
         host->cmd_per_lun = 3;
-        host->max_cmd_len = MAX_CMDSZ;
+        if ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && ql2xenabledif)
+                host->max_cmd_len = 32;
+        else
+                host->max_cmd_len = MAX_CMDSZ;
         host->max_channel = MAX_BUSES - 1;
         host->max_lun = MAX_LUNS;
         host->unique_id = host->host_no;
@@ -481,7 +485,7 @@ qla25xx_delete_req_que(struct scsi_qla_host *vha, struct req_que *req)
         return ret;
 }
 
-int
+static int
 qla25xx_delete_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
 {
         int ret = -1;
@@ -496,23 +500,6 @@ qla25xx_delete_rsp_que(struct scsi_qla_host *vha, struct rsp_que *rsp)
         return ret;
 }
 
-int qla25xx_update_req_que(struct scsi_qla_host *vha, uint8_t que, uint8_t qos)
-{
-        int ret = 0;
-        struct qla_hw_data *ha = vha->hw;
-        struct req_que *req = ha->req_q_map[que];
-
-        req->options |= BIT_3;
-        req->qos = qos;
-        ret = qla25xx_init_req_que(vha, req);
-        if (ret != QLA_SUCCESS)
-                DEBUG2_17(printk(KERN_WARNING "%s failed\n", __func__));
-        /* restore options bit */
-        req->options &= ~BIT_3;
-        return ret;
-}
-
-
 /* Delete all queues for a given vhost */
 int
 qla25xx_delete_queues(struct scsi_qla_host *vha)
@@ -739,35 +726,3 @@ que_failed:
 failed:
         return 0;
 }
-
-int
-qla25xx_create_queues(struct scsi_qla_host *vha, uint8_t qos)
-{
-        uint16_t options = 0;
-        uint8_t ret = 0;
-        struct qla_hw_data *ha = vha->hw;
-        struct rsp_que *rsp;
-
-        options |= BIT_1;
-        ret = qla25xx_create_rsp_que(ha, options, vha->vp_idx, 0, -1);
-        if (!ret) {
-                qla_printk(KERN_WARNING, ha, "Response Que create failed\n");
-                return ret;
-        } else
-                qla_printk(KERN_INFO, ha, "Response Que:%d created.\n", ret);
-        rsp = ha->rsp_q_map[ret];
-
-        options = 0;
-        if (qos & BIT_7)
-                options |= BIT_8;
-        ret = qla25xx_create_req_que(ha, options, vha->vp_idx, 0, ret,
-                                        qos & ~BIT_7);
-        if (ret) {
-                vha->req = ha->req_q_map[ret];
-                qla_printk(KERN_INFO, ha, "Request Que:%d created.\n", ret);
-        } else
-                qla_printk(KERN_WARNING, ha, "Request Que create failed\n");
-        rsp->req = ha->req_q_map[ret];
-
-        return ret;
-}