2 files changed, 5 insertions, 16 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 72533c58c1f3..3c7db3e8aa76 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -2791,12 +2791,13 @@ static struct scsi_host_template bnx2fc_shost_template = {
         .eh_host_reset_handler  = fc_eh_host_reset,
         .slave_alloc            = fc_slave_alloc,
         .change_queue_depth     = fc_change_queue_depth,
-        .change_queue_type      = fc_change_queue_type,
+        .change_queue_type      = scsi_change_queue_type,
         .this_id                = -1,
         .cmd_per_lun            = 3,
         .use_clustering         = ENABLE_CLUSTERING,
         .sg_tablesize           = BNX2FC_MAX_BDS_PER_CMD,
         .max_sectors            = 1024,
+        .use_blk_tags           = 1,
 };
 
 static struct libfc_function_template bnx2fc_libfc_fcn_templ = {
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 5b99844ef6bf..4b56858c1df2 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1725,7 +1725,6 @@ void bnx2fc_build_fcp_cmnd(struct bnx2fc_cmd *io_req,
                                   struct fcp_cmnd *fcp_cmnd)
 {
         struct scsi_cmnd *sc_cmd = io_req->sc_cmd;
-        char tag[2];
 
         memset(fcp_cmnd, 0, sizeof(struct fcp_cmnd));
 
@@ -1739,21 +1738,10 @@ void bnx2fc_build_fcp_cmnd(struct bnx2fc_cmd *io_req,
         fcp_cmnd->fc_tm_flags = io_req->mp_req.tm_flags;
         fcp_cmnd->fc_flags = io_req->io_req_flags;
 
-        if (scsi_populate_tag_msg(sc_cmd, tag)) {
-                switch (tag[0]) {
-                case HEAD_OF_QUEUE_TAG:
-                        fcp_cmnd->fc_pri_ta = FCP_PTA_HEADQ;
-                        break;
-                case ORDERED_QUEUE_TAG:
-                        fcp_cmnd->fc_pri_ta = FCP_PTA_ORDERED;
-                        break;
-                default:
-                        fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE;
-                        break;
-                }
-        } else {
+        if (sc_cmd->flags & SCMD_TAGGED)
+                fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE;
+        else
                 fcp_cmnd->fc_pri_ta = 0;
-        }
 }
 
 static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req,