diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
| commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
| tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/bnx2fc | |
| parent | 198a956a11b15b564ac06d1411881e215b587408 (diff) | |
| parent | e86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff) | |
| download | op-kernel-dev-e61745769125a3c788e7aceb2a5fb680ebb461e6.zip op-kernel-dev-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.gz | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/bnx2fc')
| -rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_io.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index e861f28..98d06d1 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c @@ -2792,7 +2792,6 @@ static struct scsi_host_template bnx2fc_shost_template = { .eh_host_reset_handler = fc_eh_host_reset, .slave_alloc = fc_slave_alloc, .change_queue_depth = scsi_change_queue_depth, - .change_queue_type = scsi_change_queue_type, .this_id = -1, .cmd_per_lun = 3, .use_clustering = ENABLE_CLUSTERING, diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c index 4b56858..9ecca85 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_io.c +++ b/drivers/scsi/bnx2fc/bnx2fc_io.c @@ -1737,11 +1737,7 @@ void bnx2fc_build_fcp_cmnd(struct bnx2fc_cmd *io_req, fcp_cmnd->fc_pri_ta = 0; fcp_cmnd->fc_tm_flags = io_req->mp_req.tm_flags; fcp_cmnd->fc_flags = io_req->io_req_flags; - - if (sc_cmd->flags & SCMD_TAGGED) - fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE; - else - fcp_cmnd->fc_pri_ta = 0; + fcp_cmnd->fc_pri_ta = FCP_PTA_SIMPLE; } static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req, |
