diff --git a/ibmvstgt/Makefile b/ibmvstgt/Makefile
index 2bc8ce127..732662885 100644
--- a/ibmvstgt/Makefile
+++ b/ibmvstgt/Makefile
@@ -30,8 +30,8 @@ INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
 
 # The file Modules.symvers has been renamed in the 2.6.18 kernel to
 # Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Module.symvers ]; then \
-		       echo Module.symvers; else echo Modules.symvers; fi)
+MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Modules.symvers ]; then \
+		       echo Modules.symvers; else echo Module.symvers; fi)
 
 
 all: src/$(MODULE_SYMVERS)
diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c
index a76ac7401..fbc8ca277 100644
--- a/iscsi-scst/kernel/iscsi.c
+++ b/iscsi-scst/kernel/iscsi.c
@@ -3950,7 +3950,6 @@ static int iscsi_get_initiator_port_transport_id(struct scst_tgt *tgt,
 	union iscsi_sid sid;
 	int tr_id_size;
 	uint8_t *tr_id;
-	uint8_t q;
 
 	TRACE_ENTRY();
 
@@ -3965,7 +3964,7 @@ static int iscsi_get_initiator_port_transport_id(struct scst_tgt *tgt,
 	sid.id.tsih = 0;
 
 	tr_id_size = 4 + strlen(sess->initiator_name) + 5 +
-		snprintf(&q, sizeof(q), "%llx", sid.id64) + 1;
+		snprintf(NULL, 0, "%llx", sid.id64) + 1;
 	tr_id_size = (tr_id_size + 3) & -4;
 
 	tr_id = kzalloc(tr_id_size, GFP_KERNEL);
diff --git a/qla2x00t/Makefile_in-tree b/qla2x00t/Makefile_in-tree
new file mode 100644
index 000000000..790426600
--- /dev/null
+++ b/qla2x00t/Makefile_in-tree
@@ -0,0 +1,4 @@
+qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
+		qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o qla_nx.o
+
+obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
diff --git a/qla2x00t/generate-in-tree-patches b/qla2x00t/generate-in-tree-patches
index 660908d40..239484e8a 100755
--- a/qla2x00t/generate-in-tree-patches
+++ b/qla2x00t/generate-in-tree-patches
@@ -7,23 +7,29 @@ if [ "$1" = "" ]; then
   exit 1
 fi
 
-if [ "${1#2.6.26}" = "$1" ]; then
-  # Exit silently for other kernel versions than 2.6.26.x.
-  exit 0
-fi
-
 if [ ! -e qla2xxx-orig/$1 ]; then
   ./extract-qla2xxx-orig "$1"
 fi
 
 mkdir -p in-tree-patches/"${kernel_version}"
 
-for f in qla2xxx-orig/"${kernel_version}"/*
-do
-  g="${f#qla2xxx-orig/${kernel_version}/}"
-  f1="$f"
+for g in Kconfig *.[ch]; do
+  f1="qla2xxx-orig/${kernel_version}/$g"
   f2="$g"
   f3="in-tree-patches/${kernel_version}/$g.patch"
+  if [ "$f1" -nt "$f3" -o "$f2" -nt "$f3" ]; then
+    if [ -e "$f1" ]; then
+      diff -up "$f1" "$f2" > "$f3"
+    else
+      diff -up /dev/null "$f2" > "$f3"
+    fi
+  fi
+done
+
+for g in Makefile; do
+  f1="qla2xxx-orig/${kernel_version}/$g"
+  f2="${g}_in-tree"
+  f3="in-tree-patches/${kernel_version}/$g.patch"
   if [ "$f1" -nt "$f3" -o "$f2" -nt "$f3" ]; then
     diff -up "$f1" "$f2" > "$f3"
   fi
diff --git a/qla2x00t/qla_bsg.c b/qla2x00t/qla_bsg.c
index 06bca9c56..4e3070f66 100644
--- a/qla2x00t/qla_bsg.c
+++ b/qla2x00t/qla_bsg.c
@@ -10,6 +10,53 @@
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 
+/*
+ * See also commit 17d5363b83f8 ("scsi: introduce a result field in struct
+ * scsi_request"). See also commit caf7df122721 ("block: remove the errors
+ * field from struct request").
+ */
+#ifndef NEW_LIBFC_API
+static inline void set_bsg_result(struct fc_bsg_job *job, int result)
+{
+	job->req->errors = result;
+}
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
+static inline void set_bsg_result(struct bsg_job *job, int result)
+{
+	job->req->errors = result;
+}
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
+static inline void set_bsg_result(struct bsg_job *job, int result)
+{
+	scsi_req(job->req)->result = result;
+}
+#else
+static inline void set_bsg_result(struct bsg_job *job, int result)
+{
+	scsi_req(blk_mq_rq_from_pdu(job))->result = result;
+}
+#endif
+
+#ifndef NEW_LIBFC_API
+static inline struct Scsi_Host *fc_bsg_to_shost(struct fc_bsg_job *job)
+{
+	return job->shost;
+}
+
+static inline struct fc_rport *fc_bsg_to_rport(struct fc_bsg_job *job)
+{
+	return job->rport;
+}
+
+static inline void bsg_job_done_backport(struct fc_bsg_job *job, int result,
+					 unsigned int reply_payload_rcv_len)
+{
+	job->job_done(job);
+}
+
+#define bsg_job_done bsg_job_done_backport
+#endif
+
 /* BSG support for ELS/CT pass through */
 void
 qla2x00_bsg_job_done(void *data, void *ptr, int res)
@@ -20,17 +67,11 @@ qla2x00_bsg_job_done(void *data, void *ptr, int res)
 	struct fc_bsg_job *bsg_job = sp->u.bsg_job;
 #else
 	struct bsg_job *bsg_job = sp->u.bsg_job;
+#endif
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
-#endif
 
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->result = res;
-	bsg_job->job_done(bsg_job);
-#else
 	bsg_reply->result = res;
-	bsg_job_done(bsg_job, bsg_reply->result,
-		       bsg_reply->reply_payload_rcv_len);
-#endif
+	bsg_job_done(bsg_job, res, bsg_reply->reply_payload_rcv_len);
 	sp->free(vha, sp);
 }
 
@@ -120,13 +161,9 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
 qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
 	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
-#endif
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int ret = 0;
@@ -139,11 +176,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 	}
 
 	/* Get the sub command */
-#ifndef NEW_LIBFC_API
-	oper = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
-#else
 	oper = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
-#endif
 
 	/* Only set config is allowed if config memory is not allocated */
 	if (!ha->fcp_prio_cfg && (oper != QLFC_FCP_PRIO_SET_CONFIG)) {
@@ -157,18 +190,10 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 			ha->fcp_prio_cfg->attributes &=
 				~FCP_PRIO_ATTR_ENABLE;
 			qla24xx_update_all_fcp_prio(vha);
-#ifndef NEW_LIBFC_API
-			bsg_job->reply->result = DID_OK;
-#else
 			bsg_reply->result = DID_OK;
-#endif
 		} else {
 			ret = -EINVAL;
-#ifndef NEW_LIBFC_API
-			bsg_job->reply->result = (DID_ERROR << 16);
-#else
 			bsg_reply->result = (DID_ERROR << 16);
-#endif
 			goto exit_fcp_prio_cfg;
 		}
 		break;
@@ -180,18 +205,10 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 				ha->fcp_prio_cfg->attributes |=
 				    FCP_PRIO_ATTR_ENABLE;
 				qla24xx_update_all_fcp_prio(vha);
-#ifndef NEW_LIBFC_API
-				bsg_job->reply->result = DID_OK;
-#else
 				bsg_reply->result = DID_OK;
-#endif
 			} else {
 				ret = -EINVAL;
-#ifndef NEW_LIBFC_API
-				bsg_job->reply->result = (DID_ERROR << 16);
-#else
 				bsg_reply->result = (DID_ERROR << 16);
-#endif
 				goto exit_fcp_prio_cfg;
 			}
 		}
@@ -201,21 +218,12 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 		len = bsg_job->reply_payload.payload_len;
 		if (!len || len > FCP_PRIO_CFG_SIZE) {
 			ret = -EINVAL;
-#ifndef NEW_LIBFC_API
-			bsg_job->reply->result = (DID_ERROR << 16);
-#else
 			bsg_reply->result = (DID_ERROR << 16);
-#endif
 			goto exit_fcp_prio_cfg;
 		}
 
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = DID_OK;
-		bsg_job->reply->reply_payload_rcv_len =
-#else
 		bsg_reply->result = DID_OK;
 		bsg_reply->reply_payload_rcv_len =
-#endif
 			sg_copy_from_buffer(
 			bsg_job->reply_payload.sg_list,
 			bsg_job->reply_payload.sg_cnt, ha->fcp_prio_cfg,
@@ -226,11 +234,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 	case QLFC_FCP_PRIO_SET_CONFIG:
 		len = bsg_job->request_payload.payload_len;
 		if (!len || len > FCP_PRIO_CFG_SIZE) {
-#ifndef NEW_LIBFC_API
-			bsg_job->reply->result = (DID_ERROR << 16);
-#else
 			bsg_reply->result = (DID_ERROR << 16);
-#endif
 			ret = -EINVAL;
 			goto exit_fcp_prio_cfg;
 		}
@@ -241,11 +245,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 				ql_log(ql_log_warn, vha, 0x7050,
 				    "Unable to allocate memory for fcp prio "
 				    "config data (%x).\n", FCP_PRIO_CFG_SIZE);
-#ifndef NEW_LIBFC_API
-				bsg_job->reply->result = (DID_ERROR << 16);
-#else
 				bsg_reply->result = (DID_ERROR << 16);
-#endif
 				ret = -ENOMEM;
 				goto exit_fcp_prio_cfg;
 			}
@@ -260,11 +260,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 
 		if (!qla24xx_fcp_prio_cfg_valid(vha,
 		    (struct qla_fcp_prio_cfg *) ha->fcp_prio_cfg, 1)) {
-#ifndef NEW_LIBFC_API
-			bsg_job->reply->result = (DID_ERROR << 16);
-#else
 			bsg_reply->result = (DID_ERROR << 16);
-#endif
 			ret = -EINVAL;
 			/* If buffer was invalidatic int
 			 * fcp_prio_cfg is of no use
@@ -278,11 +274,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct bsg_job *bsg_job)
 		if (ha->fcp_prio_cfg->attributes & FCP_PRIO_ATTR_ENABLE)
 			ha->flags.fcp_prio_enabled = 1;
 		qla24xx_update_all_fcp_prio(vha);
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = DID_OK;
-#else
 		bsg_reply->result = DID_OK;
-#endif
 		break;
 	default:
 		ret = -EINVAL;
@@ -306,9 +298,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
 qla2x00_process_els(struct bsg_job *bsg_job)
 #endif
 {
-#ifdef NEW_LIBFC_API
 	struct fc_bsg_request *bsg_request = bsg_job->request;
-#endif
 	struct fc_rport *rport;
 	fc_port_t *fcport = NULL;
 	struct Scsi_Host *host;
@@ -321,33 +311,19 @@ qla2x00_process_els(struct bsg_job *bsg_job)
 	uint16_t nextlid = 0;
 
 #ifdef __COVERITY__
-#ifndef NEW_LIBFC_API
-	BUG_ON(bsg_job->request->msgcode != FC_BSG_RPT_ELS &&
-	       bsg_job->request->msgcode != FC_BSG_HST_ELS_NOLOGIN);
-#else
 	BUG_ON(bsg_request->msgcode != FC_BSG_RPT_ELS &&
 	       bsg_request->msgcode != FC_BSG_HST_ELS_NOLOGIN);
 #endif
-#endif
 
-#ifndef NEW_LIBFC_API
-	if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
-		rport = bsg_job->rport;
-#else
 	if (bsg_request->msgcode == FC_BSG_RPT_ELS) {
-		rport = fc_bsg_to_rport(bsg_job);;
-#endif
+		rport = fc_bsg_to_rport(bsg_job);
 		fcport = *(fc_port_t **) rport->dd_data;
 		host = rport_to_shost(rport);
 		vha = shost_priv(host);
 		ha = vha->hw;
 		type = "FC_BSG_RPT_ELS";
 	} else {
-#ifndef NEW_LIBFC_API
-		host = bsg_job->shost;
-#else
 		host = fc_bsg_to_shost(bsg_job);
-#endif
 		vha = shost_priv(host);
 		ha = vha->hw;
 		type = "FC_BSG_HST_ELS_NOLOGIN";
@@ -374,11 +350,7 @@ qla2x00_process_els(struct bsg_job *bsg_job)
 	}
 
 	/* ELS request for rport */
-#ifndef NEW_LIBFC_API
-	if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
-#else
 	if (bsg_request->msgcode == FC_BSG_RPT_ELS) {
-#endif
 		/* make sure the rport is logged in,
 		 * if not perform fabric login
 		 */
@@ -403,21 +375,12 @@ qla2x00_process_els(struct bsg_job *bsg_job)
 
 		/* Initialize all required  fields of fcport */
 		fcport->vha = vha;
-#ifndef NEW_LIBFC_API
-		fcport->d_id.b.al_pa =
-			bsg_job->request->rqst_data.h_els.port_id[0];
-		fcport->d_id.b.area =
-			bsg_job->request->rqst_data.h_els.port_id[1];
-		fcport->d_id.b.domain =
-			bsg_job->request->rqst_data.h_els.port_id[2];
-#else
 		fcport->d_id.b.al_pa =
 			bsg_request->rqst_data.h_els.port_id[0];
 		fcport->d_id.b.area =
 			bsg_request->rqst_data.h_els.port_id[1];
 		fcport->d_id.b.domain =
 			bsg_request->rqst_data.h_els.port_id[2];
-#endif
 		fcport->loop_id =
 			(fcport->d_id.b.al_pa == 0xFD) ?
 			NPH_FABRIC_CONTROLLER : NPH_F_PORT;
@@ -462,21 +425,12 @@ qla2x00_process_els(struct bsg_job *bsg_job)
 		goto done_unmap_sg;
 	}
 
-#ifndef NEW_LIBFC_API
-	sp->type =
-		(bsg_job->request->msgcode == FC_BSG_RPT_ELS ?
-		SRB_ELS_CMD_RPT : SRB_ELS_CMD_HST);
-	sp->name =
-		(bsg_job->request->msgcode == FC_BSG_RPT_ELS ?
-		"bsg_els_rpt" : "bsg_els_hst");
-#else
 	sp->type =
 		(bsg_request->msgcode == FC_BSG_RPT_ELS ?
 		SRB_ELS_CMD_RPT : SRB_ELS_CMD_HST);
 	sp->name =
 		(bsg_request->msgcode == FC_BSG_RPT_ELS ?
 		"bsg_els_rpt" : "bsg_els_hst");
-#endif
 	sp->u.bsg_job = bsg_job;
 	sp->free = qla2x00_bsg_sp_free;
 	sp->done = qla2x00_bsg_job_done;
@@ -484,11 +438,7 @@ qla2x00_process_els(struct bsg_job *bsg_job)
 	ql_dbg(ql_dbg_user, vha, 0x700a,
 	    "bsg rqst type: %s els type: %x - loop-id=%x "
 	    "portid=%-2x%02x%02x.\n", type,
-#ifndef NEW_LIBFC_API
-	    bsg_job->request->rqst_data.h_els.command_code, fcport->loop_id,
-#else
 	    bsg_request->rqst_data.h_els.command_code, fcport->loop_id,
-#endif
 	    fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa);
 
 	rval = qla2x00_start_sp(sp);
@@ -509,11 +459,7 @@ done_unmap_sg:
 	goto done_free_fcport;
 
 done_free_fcport:
-#ifndef NEW_LIBFC_API
-	if (bsg_job->request->msgcode == FC_BSG_HST_ELS_NOLOGIN)
-#else
 	if (bsg_request->msgcode == FC_BSG_HST_ELS_NOLOGIN)
-#endif
 		kfree(fcport);
 done:
 	return rval;
@@ -543,9 +489,9 @@ qla2x00_process_ct(struct bsg_job *bsg_job)
 #ifndef NEW_LIBFC_API
 	struct Scsi_Host *host = bsg_job->shost;
 #else
-	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
 #endif
+	struct fc_bsg_request *bsg_request = bsg_job->request;
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int rval = (DRIVER_ERROR << 16);
@@ -591,11 +537,7 @@ qla2x00_process_ct(struct bsg_job *bsg_job)
 	}
 
 	loop_id =
-#ifndef NEW_LIBFC_API
-		(bsg_job->request->rqst_data.h_ct.preamble_word1 & 0xFF000000)
-#else
 		(bsg_request->rqst_data.h_ct.preamble_word1 & 0xFF000000)
-#endif
 			>> 24;
 	switch (loop_id) {
 	case 0xFC:
@@ -626,15 +568,9 @@ qla2x00_process_ct(struct bsg_job *bsg_job)
 
 	/* Initialize all required  fields of fcport */
 	fcport->vha = vha;
-#ifndef NEW_LIBFC_API
-	fcport->d_id.b.al_pa = bsg_job->request->rqst_data.h_ct.port_id[0];
-	fcport->d_id.b.area = bsg_job->request->rqst_data.h_ct.port_id[1];
-	fcport->d_id.b.domain = bsg_job->request->rqst_data.h_ct.port_id[2];
-#else
 	fcport->d_id.b.al_pa = bsg_request->rqst_data.h_ct.port_id[0];
 	fcport->d_id.b.area = bsg_request->rqst_data.h_ct.port_id[1];
 	fcport->d_id.b.domain = bsg_request->rqst_data.h_ct.port_id[2];
-#endif
 	fcport->loop_id = loop_id;
 
 	/* Alloc SRB structure */
@@ -656,11 +592,7 @@ qla2x00_process_ct(struct bsg_job *bsg_job)
 	ql_dbg(ql_dbg_user, vha, 0x7016,
 	    "bsg rqst type: %s else type: %x - "
 	    "loop-id=%x portid=%02x%02x%02x.\n", type,
-#ifndef NEW_LIBFC_API
-	    (bsg_job->request->rqst_data.h_ct.preamble_word2 >> 16),
-#else
 	    (bsg_request->rqst_data.h_ct.preamble_word2 >> 16),
-#endif
 	    fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area,
 	    fcport->d_id.b.al_pa);
 
@@ -785,10 +717,10 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 #ifndef NEW_LIBFC_API
 	struct Scsi_Host *host = bsg_job->shost;
 #else
-	struct fc_bsg_request *bsg_request = bsg_job->request;
-	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
 #endif
+	struct fc_bsg_request *bsg_request = bsg_job->request;
+	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int rval;
@@ -870,11 +802,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 	elreq.rcv_dma = rsp_data_dma;
 	elreq.transfer_size = req_data_len;
 
-#ifndef NEW_LIBFC_API
-	elreq.options = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
-#else
 	elreq.options = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
-#endif
 
 	if ((ha->current_topology == ISP_CFG_F ||
 	    ((IS_QLA81XX(ha) || IS_QLA8031(ha)) &&
@@ -893,11 +821,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 			if (qla81xx_get_port_config(vha, config)) {
 				ql_log(ql_log_warn, vha, 0x701f,
 				    "Get port config failed.\n");
-#ifndef NEW_LIBFC_API
-				bsg_job->reply->result = (DID_ERROR << 16);
-#else
 				bsg_reply->result = (DID_ERROR << 16);
-#endif
 				rval = -EPERM;
 				goto done_free_dma_req;
 			}
@@ -910,11 +834,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 					new_config)) {
 					ql_log(ql_log_warn, vha, 0x7024,
 					    "Internal loopback failed.\n");
-#ifndef NEW_LIBFC_API
-					bsg_job->reply->result =
-#else
 					bsg_reply->result =
-#endif
 						(DID_ERROR << 16);
 					rval = -EPERM;
 					goto done_free_dma_req;
@@ -925,11 +845,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 				 */
 				if (qla81xx_reset_internal_loopback(vha,
 					config, 1)) {
-#ifndef NEW_LIBFC_API
-					bsg_job->reply->result =
-#else
 					bsg_reply->result =
-#endif
 						(DID_ERROR << 16);
 					rval = -EPERM;
 					goto done_free_dma_req;
@@ -965,11 +881,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 					    "MPI reset failed.\n");
 				}
 
-#ifndef NEW_LIBFC_API
-				bsg_job->reply->result = (DID_ERROR << 16);
-#else
 				bsg_reply->result = (DID_ERROR << 16);
-#endif
 				rval = -EIO;
 				goto done_free_dma_req;
 			}
@@ -986,50 +898,28 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
 		ql_log(ql_log_warn, vha, 0x702c,
 		    "Vendor request %s failed.\n", type);
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-		fw_sts_ptr = ((uint8_t *)scsi_req(bsg_job->req)->sense) +
+		fw_sts_ptr = bsg_job_sense(bsg_job) +
 			 sizeof(struct fc_bsg_reply);
-#else
-		fw_sts_ptr = ((uint8_t *)bsg_job->req->sense) +
-			sizeof(struct fc_bsg_reply);
-#endif
 
 		memcpy(fw_sts_ptr, response, sizeof(response));
 		fw_sts_ptr += sizeof(response);
 		*fw_sts_ptr = command_sent;
 		rval = 0;
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = (DID_ERROR << 16);
-#else
 		bsg_reply->result = (DID_ERROR << 16);
-#endif
 	} else {
 		ql_dbg(ql_dbg_user, vha, 0x702d,
 		    "Vendor request %s completed.\n", type);
 
 		bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
 			sizeof(response) + sizeof(uint8_t);
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->reply_payload_rcv_len =
-#else
 		bsg_reply->reply_payload_rcv_len =
-#endif
 			bsg_job->reply_payload.payload_len;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-		fw_sts_ptr = ((uint8_t *)scsi_req(bsg_job->req)->sense) +
+		fw_sts_ptr = bsg_job_sense(bsg_job) +
 			 sizeof(struct fc_bsg_reply);
-#else
-		fw_sts_ptr = ((uint8_t *)bsg_job->req->sense) +
-			sizeof(struct fc_bsg_reply);
-#endif
 		memcpy(fw_sts_ptr, response, sizeof(response));
 		fw_sts_ptr += sizeof(response);
 		*fw_sts_ptr = command_sent;
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = DID_OK;
-#else
 		bsg_reply->result = DID_OK;
-#endif
 		sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
 			bsg_job->reply_payload.sg_cnt, rsp_data,
 			rsp_data_len);
@@ -1065,13 +955,9 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
 qla84xx_reset(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
-	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
+	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
-#endif
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int rval = 0;
@@ -1082,11 +968,7 @@ qla84xx_reset(struct bsg_job *bsg_job)
 		return -EINVAL;
 	}
 
-#ifndef NEW_LIBFC_API
-	flag = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
-#else
 	flag = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
-#endif
 
 	rval = qla84xx_reset_chip(vha, flag == A84_ISSUE_RESET_DIAG_FW);
 
@@ -1094,19 +976,11 @@ qla84xx_reset(struct bsg_job *bsg_job)
 		ql_log(ql_log_warn, vha, 0x7030,
 		    "Vendor request 84xx reset failed.\n");
 		rval = 0;
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = (DID_ERROR << 16);
-#else
 		bsg_reply->result = (DID_ERROR << 16);
-#endif
 	} else {
 		ql_dbg(ql_dbg_user, vha, 0x7031,
 		    "Vendor request 84xx reset completed.\n");
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = DID_OK;
-#else
 		bsg_reply->result = DID_OK;
-#endif
 	}
 
 #ifndef NEW_LIBFC_API
@@ -1126,13 +1000,9 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
 qla84xx_updatefw(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
+	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
 	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
-	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
-#endif
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	struct verify_chip_entry_84xx *mn = NULL;
@@ -1189,11 +1059,7 @@ qla84xx_updatefw(struct bsg_job *bsg_job)
 		goto done_free_fw_buf;
 	}
 
-#ifndef NEW_LIBFC_API
-	flag = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
-#else
 	flag = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
-#endif
 	fw_ver = le32_to_cpu(*((uint32_t *)((uint32_t *)fw_buf + 2)));
 
 	memset(mn, 0, sizeof(struct access_chip_84xx));
@@ -1220,21 +1086,13 @@ qla84xx_updatefw(struct bsg_job *bsg_job)
 		    "Vendor request 84xx updatefw failed.\n");
 
 		rval = 0;
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = (DID_ERROR << 16);
-#else
 		bsg_reply->result = (DID_ERROR << 16);
-#endif
 	} else {
 		ql_dbg(ql_dbg_user, vha, 0x7038,
 		    "Vendor request 84xx updatefw completed.\n");
 
 		bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = DID_OK;
-#else
 		bsg_reply->result = DID_OK;
-#endif
 	}
 
 #ifndef NEW_LIBFC_API
@@ -1263,13 +1121,9 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
 qla84xx_mgmt_cmd(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
+	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
 	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
-	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
-#endif
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	struct access_chip_84xx *mn = NULL;
@@ -1287,12 +1141,7 @@ qla84xx_mgmt_cmd(struct bsg_job *bsg_job)
 		return -EINVAL;
 	}
 
-#ifndef NEW_LIBFC_API
-	ql84_mgmt = (struct qla_bsg_a84_mgmt *)((char *)bsg_job->request +
-		sizeof(struct fc_bsg_request));
-#else
 	ql84_mgmt = (void *)bsg_request + sizeof(struct fc_bsg_request);
-#endif
 
 	mn = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &mn_dma);
 	if (!mn) {
@@ -1430,29 +1279,17 @@ qla84xx_mgmt_cmd(struct bsg_job *bsg_job)
 		    "Vendor request 84xx mgmt failed.\n");
 
 		rval = 0;
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = (DID_ERROR << 16);
-#else
 		bsg_reply->result = (DID_ERROR << 16);
-#endif
 	} else {
 		ql_dbg(ql_dbg_user, vha, 0x7044,
 		    "Vendor request 84xx mgmt completed.\n");
 
 		bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = DID_OK;
-#else
 		bsg_reply->result = DID_OK;
-#endif
 
 		if ((ql84_mgmt->mgmt.cmd == QLA84_MGMT_READ_MEM) ||
 			(ql84_mgmt->mgmt.cmd == QLA84_MGMT_GET_INFO)) {
-#ifndef NEW_LIBFC_API
-			bsg_job->reply->reply_payload_rcv_len =
-#else
 			bsg_reply->reply_payload_rcv_len =
-#endif
 				bsg_job->reply_payload.payload_len;
 
 			sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
@@ -1493,13 +1330,9 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
 qla24xx_iidma(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
+	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
 	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
-	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
-#endif
 	scsi_qla_host_t *vha = shost_priv(host);
 	int rval = 0;
 	struct qla_port_param *port_param = NULL;
@@ -1512,12 +1345,7 @@ qla24xx_iidma(struct bsg_job *bsg_job)
 		return -EINVAL;
 	}
 
-#ifndef NEW_LIBFC_API
-	port_param = (struct qla_port_param *)((char *)bsg_job->request +
-		sizeof(struct fc_bsg_request));
-#else
 	port_param = (void *)bsg_request + sizeof(struct fc_bsg_request);
-#endif
 	if (port_param->fc_scsi_addr.dest_type != EXT_DEF_TYPE_WWPN) {
 		ql_log(ql_log_warn, vha, 0x7048,
 		    "Invalid destination type.\n");
@@ -1568,11 +1396,7 @@ qla24xx_iidma(struct bsg_job *bsg_job)
 		    fcport->port_name[5], fcport->port_name[6],
 		    fcport->port_name[7], rval, fcport->fp_speed, mb[0], mb[1]);
 		rval = 0;
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = (DID_ERROR << 16);
-#else
 		bsg_reply->result = (DID_ERROR << 16);
-#endif
 	} else {
 		if (!port_param->mode) {
 			bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
@@ -1585,11 +1409,7 @@ qla24xx_iidma(struct bsg_job *bsg_job)
 				sizeof(struct qla_port_param));
 		}
 
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = DID_OK;
-#else
 		bsg_reply->result = DID_OK;
-#endif
 	}
 
 #ifndef NEW_LIBFC_API
@@ -1610,9 +1430,7 @@ qla2x00_optrom_setup(struct bsg_job *bsg_job, scsi_qla_host_t *vha,
 #endif
     uint8_t is_update)
 {
-#ifdef NEW_LIBFC_API
 	struct fc_bsg_request *bsg_request = bsg_job->request;
-#endif
 	uint32_t start = 0;
 	int valid = 0;
 	struct qla_hw_data *ha = vha->hw;
@@ -1620,11 +1438,7 @@ qla2x00_optrom_setup(struct bsg_job *bsg_job, scsi_qla_host_t *vha,
 	if (unlikely(pci_channel_offline(ha->pdev)))
 		return -EINVAL;
 
-#ifndef NEW_LIBFC_API
-	start = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
-#else
 	start = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
-#endif
 	if (start > ha->optrom_size) {
 		ql_log(ql_log_warn, vha, 0x7055,
 		    "start %d > optrom_size %d.\n", start, ha->optrom_size);
@@ -1689,12 +1503,8 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
 qla2x00_read_optrom(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
-	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
-#endif
+	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int rval = 0;
@@ -1713,22 +1523,13 @@ qla2x00_read_optrom(struct bsg_job *bsg_job)
 	    bsg_job->reply_payload.sg_cnt, ha->optrom_buffer,
 	    ha->optrom_region_size);
 
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->reply_payload_rcv_len = ha->optrom_region_size;
-	bsg_job->reply->result = DID_OK;
-#else
 	bsg_reply->reply_payload_rcv_len = ha->optrom_region_size;
 	bsg_reply->result = DID_OK;
-#endif
 	vfree(ha->optrom_buffer);
 	ha->optrom_buffer = NULL;
 	ha->optrom_state = QLA_SWAITING;
-#ifndef NEW_LIBFC_API
-	bsg_job->job_done(bsg_job);
-#else
 	bsg_job_done(bsg_job, bsg_reply->result,
 		bsg_reply->reply_payload_rcv_len);
-#endif
 	return rval;
 }
 
@@ -1739,12 +1540,8 @@ qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
 qla2x00_update_optrom(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
-	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
-#endif
+	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int rval = 0;
@@ -1763,20 +1560,12 @@ qla2x00_update_optrom(struct bsg_job *bsg_job)
 	ha->isp_ops->write_optrom(vha, ha->optrom_buffer,
 	    ha->optrom_region_start, ha->optrom_region_size);
 
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->result = DID_OK;
-#else
 	bsg_reply->result = DID_OK;
-#endif
 	vfree(ha->optrom_buffer);
 	ha->optrom_buffer = NULL;
 	ha->optrom_state = QLA_SWAITING;
-#ifndef NEW_LIBFC_API
-	bsg_job->job_done(bsg_job);
-#else
 	bsg_job_done(bsg_job, bsg_reply->result,
 		bsg_reply->reply_payload_rcv_len);
-#endif
 	return rval;
 }
 
@@ -1787,12 +1576,8 @@ qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job)
 qla2x00_update_fru_versions(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
-	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
-#endif
+	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int rval = 0;
@@ -1803,11 +1588,7 @@ qla2x00_update_fru_versions(struct bsg_job *bsg_job)
 	dma_addr_t sfp_dma;
 	void *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
 	if (!sfp) {
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-#else
 		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
-#endif
 		    EXT_STATUS_NO_MEMORY;
 		goto done;
 	}
@@ -1823,36 +1604,23 @@ qla2x00_update_fru_versions(struct bsg_job *bsg_job)
 		    image->field_address.device, image->field_address.offset,
 		    sizeof(image->field_info), image->field_address.option);
 		if (rval) {
-#ifndef NEW_LIBFC_API
-			bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-#else
 			bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
-#endif
 			    EXT_STATUS_MAILBOX;
 			goto dealloc;
 		}
 		image++;
 	}
 
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-#else
 	bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-#endif
 
 dealloc:
 	dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
 
 done:
 	bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->result = DID_OK << 16;
-	bsg_job->job_done(bsg_job);
-#else
 	bsg_reply->result = DID_OK << 16;
 	bsg_job_done(bsg_job, bsg_reply->result,
 		bsg_reply->reply_payload_rcv_len);
-#endif
 
 	return 0;
 }
@@ -1864,12 +1632,8 @@ qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)
 qla2x00_read_fru_status(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
-	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
-#endif
+	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int rval = 0;
@@ -1878,11 +1642,7 @@ qla2x00_read_fru_status(struct bsg_job *bsg_job)
 	dma_addr_t sfp_dma;
 	uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
 	if (!sfp) {
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-#else
 		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
-#endif
 		    EXT_STATUS_NO_MEMORY;
 		goto done;
 	}
@@ -1896,11 +1656,7 @@ qla2x00_read_fru_status(struct bsg_job *bsg_job)
 	sr->status_reg = *sfp;
 
 	if (rval) {
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-#else
 		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
-#endif
 		    EXT_STATUS_MAILBOX;
 		goto dealloc;
 	}
@@ -1908,27 +1664,17 @@ qla2x00_read_fru_status(struct bsg_job *bsg_job)
 	sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
 	    bsg_job->reply_payload.sg_cnt, sr, sizeof(*sr));
 
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-#else
 	bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-#endif
 
 dealloc:
 	dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
 
 done:
 	bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->reply_payload_rcv_len = sizeof(*sr);
-	bsg_job->reply->result = DID_OK << 16;
-	bsg_job->job_done(bsg_job);
-#else
 	bsg_reply->reply_payload_rcv_len = sizeof(*sr);
 	bsg_reply->result = DID_OK << 16;
 	bsg_job_done(bsg_job, bsg_reply->result,
 		bsg_reply->reply_payload_rcv_len);
-#endif
 
 	return 0;
 }
@@ -1940,12 +1686,8 @@ qla2x00_write_fru_status(struct fc_bsg_job *bsg_job)
 qla2x00_write_fru_status(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	struct Scsi_Host *host = bsg_job->shost;
-#else
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	struct Scsi_Host *host = fc_bsg_to_shost(bsg_job);
-#endif
 	scsi_qla_host_t *vha = shost_priv(host);
 	struct qla_hw_data *ha = vha->hw;
 	int rval = 0;
@@ -1954,11 +1696,7 @@ qla2x00_write_fru_status(struct bsg_job *bsg_job)
 	dma_addr_t sfp_dma;
 	uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
 	if (!sfp) {
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-#else
 		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
-#endif
 		    EXT_STATUS_NO_MEMORY;
 		goto done;
 	}
@@ -1972,34 +1710,21 @@ qla2x00_write_fru_status(struct bsg_job *bsg_job)
 	    sizeof(sr->status_reg), sr->field_address.option);
 
 	if (rval) {
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] =
-#else
 		bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
-#endif
 		    EXT_STATUS_MAILBOX;
 		goto dealloc;
 	}
 
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-#else
 	bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
-#endif
 
 dealloc:
 	dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
 
 done:
 	bsg_job->reply_len = sizeof(struct fc_bsg_reply);
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->result = DID_OK << 16;
-	bsg_job->job_done(bsg_job);
-#else
 	bsg_reply->result = DID_OK << 16;
 	bsg_job_done(bsg_job, bsg_reply->result,
 		bsg_reply->reply_payload_rcv_len);
-#endif
 
 	return 0;
 }
@@ -2011,16 +1736,10 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
 qla2x00_process_vendor_specific(struct bsg_job *bsg_job)
 #endif
 {
-#ifdef NEW_LIBFC_API
 	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
-#endif
 
-#ifndef NEW_LIBFC_API
-	switch (bsg_job->request->rqst_data.h_vendor.vendor_cmd[0]) {
-#else
 	switch (bsg_request->rqst_data.h_vendor.vendor_cmd[0]) {
-#endif
 	case QL_VND_LOOPBACK:
 		return qla2x00_process_loopback(bsg_job);
 
@@ -2055,11 +1774,9 @@ qla2x00_process_vendor_specific(struct bsg_job *bsg_job)
 		return qla2x00_write_fru_status(bsg_job);
 
 	default:
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = (DID_ERROR << 16);
-		bsg_job->job_done(bsg_job);
-#else
 		bsg_reply->result = (DID_ERROR << 16);
+#ifndef NEW_LIBFC_API
+		bsg_job->job_done(bsg_job);
 #endif
 		return -ENOTSUPP;
 	}
@@ -2072,48 +1789,32 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
 qla24xx_bsg_request(struct bsg_job *bsg_job)
 #endif
 {
-#ifdef NEW_LIBFC_API
 	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
-#endif
 	int ret = -EINVAL;
 	struct fc_rport *rport;
 	struct Scsi_Host *host;
 	scsi_qla_host_t *vha;
 
 	/* In case no data transferred. */
-#ifndef NEW_LIBFC_API
-	bsg_job->reply->reply_payload_rcv_len = 0;
-
-	if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) {
-		rport = bsg_job->rport;
-#else
 	bsg_reply->reply_payload_rcv_len = 0;
 
 	if (bsg_request->msgcode == FC_BSG_RPT_ELS) {
 		rport = fc_bsg_to_rport(bsg_job);
-#endif
 		host = rport_to_shost(rport);
 		vha = shost_priv(host);
 	} else {
-#ifndef NEW_LIBFC_API
-		host = bsg_job->shost;
-#else
 		host = fc_bsg_to_shost(bsg_job);
-#endif
 		vha = shost_priv(host);
 	}
 
 	if (qla2x00_reset_active(vha)) {
 		ql_dbg(ql_dbg_user, vha, 0x709f,
 		    "BSG: ISP abort active/needed -- cmd=%d.\n",
-#ifndef NEW_LIBFC_API
-		    bsg_job->request->msgcode);
-		bsg_job->reply->result = (DID_ERROR << 16);
-		bsg_job->job_done(bsg_job);
-#else
 		    bsg_request->msgcode);
 		bsg_reply->result = (DID_ERROR << 16);
+#ifndef NEW_LIBFC_API
+		bsg_job->job_done(bsg_job);
 #endif
 		return -EBUSY;
 	}
@@ -2125,11 +1826,7 @@ qla24xx_bsg_request(struct bsg_job *bsg_job)
 	    "Entered %s msgcode=0x%x.\n", __func__, bsg_request->msgcode);
 #endif
 
-#ifndef NEW_LIBFC_API
-	switch (bsg_job->request->msgcode) {
-#else
 	switch (bsg_request->msgcode) {
-#endif
 	case FC_BSG_RPT_ELS:
 	case FC_BSG_HST_ELS_NOLOGIN:
 		ret = qla2x00_process_els(bsg_job);
@@ -2145,11 +1842,7 @@ qla24xx_bsg_request(struct bsg_job *bsg_job)
 	case FC_BSG_RPT_CT:
 	default:
 		ql_log(ql_log_warn, vha, 0x705a, "Unsupported BSG request.\n");
-#ifndef NEW_LIBFC_API
-		bsg_job->reply->result = ret;
-#else
 		bsg_reply->result = ret;
-#endif
 		break;
 	}
 	return ret;
@@ -2162,13 +1855,9 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
 qla24xx_bsg_timeout(struct bsg_job *bsg_job)
 #endif
 {
-#ifndef NEW_LIBFC_API
-	scsi_qla_host_t *vha = shost_priv(bsg_job->shost);
-#else
 	struct fc_bsg_request *bsg_request = bsg_job->request;
 	struct fc_bsg_reply *bsg_reply = bsg_job->reply;
 	scsi_qla_host_t *vha = shost_priv(fc_bsg_to_shost(bsg_job));
-#endif
 	struct qla_hw_data *ha = vha->hw;
 	srb_t *sp;
 	int cnt, que;
@@ -2193,30 +1882,14 @@ qla24xx_bsg_timeout(struct bsg_job *bsg_job)
 						ql_log(ql_log_warn, vha, 0x7089,
 						    "mbx abort_command "
 						    "failed.\n");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-						scsi_req(bsg_job->req)->result =
-#else
-						bsg_job->req->errors =
-#endif
-#ifndef NEW_LIBFC_API
-						bsg_job->reply->result = -EIO;
-#else
+						set_bsg_result(bsg_job, -EIO);
 						bsg_reply->result = -EIO;
-#endif
 					} else {
 						ql_dbg(ql_dbg_user, vha, 0x708a,
 						    "mbx abort_command "
 						    "success.\n");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-						scsi_req(bsg_job->req)->result =
-#else
-						bsg_job->req->errors =
-#endif
-#ifndef NEW_LIBFC_API
-						bsg_job->reply->result = 0;
-#else
+						set_bsg_result(bsg_job, 0);
 						bsg_reply->result = 0;
-#endif
 					}
 					spin_lock_irqsave(&ha->hardware_lock, flags);
 					goto done;
@@ -2226,25 +1899,13 @@ qla24xx_bsg_timeout(struct bsg_job *bsg_job)
 	}
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
 	ql_log(ql_log_info, vha, 0x708b, "SRB not found to abort.\n");
-#ifndef NEW_LIBFC_API
-	bsg_job->req->errors = bsg_job->reply->result = -ENXIO;
-#else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
-	scsi_req(bsg_job->req)->result =
-#else
-	bsg_job->req->errors =
-#endif
+	set_bsg_result(bsg_job, -ENXIO);
 	bsg_reply->result = -ENXIO;
-#endif
 	return 0;
 
 done:
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
-#ifndef NEW_LIBFC_API
-	if (bsg_job->request->msgcode == FC_BSG_HST_CT)
-#else
 	if (bsg_request->msgcode == FC_BSG_HST_CT)
-#endif
 		kfree(sp->fcport);
 	mempool_free(sp, ha->srb_mempool);
 	return 0;
diff --git a/qla2x00t/qla_gs.c b/qla2x00t/qla_gs.c
index bec33e319..8c42f849f 100644
--- a/qla2x00t/qla_gs.c
+++ b/qla2x00t/qla_gs.c
@@ -1365,7 +1365,8 @@ qla2x00_fdmi_rhba(scsi_qla_host_t *vha)
 	/* Model description. */
 	eiter = (struct ct_fdmi_hba_attr *) (entries + size);
 	eiter->type = cpu_to_be16(FDMI_HBA_MODEL_DESCRIPTION);
-	strncpy(eiter->a.model_desc, ha->model_desc, 80);
+	strlcpy(eiter->a.model_desc, ha->model_desc,
+		sizeof(eiter->a.model_desc));
 	alen = strlen(eiter->a.model_desc);
 	alen += (alen & 3) ? (4 - (alen & 3)) : 4;
 	eiter->len = cpu_to_be16(4 + alen);
@@ -1653,8 +1654,8 @@ qla2x00_fdmi_rpa(scsi_qla_host_t *vha)
 		ct_req->req.rpa.attrs.count = cpu_to_be32(FDMI_PORT_ATTR_COUNT);
 		eiter = (struct ct_fdmi_port_attr *) (entries + size);
 		eiter->type = cpu_to_be16(FDMI_PORT_HOST_NAME);
-		snprintf(eiter->a.host_name, sizeof(eiter->a.host_name),
-		    "%s", fc_host_system_hostname(vha->host));
+		strlcpy(eiter->a.host_name, fc_host_system_hostname(vha->host),
+			sizeof(eiter->a.host_name));
 		alen = strlen(eiter->a.host_name);
 		alen += (alen & 3) ? (4 - (alen & 3)) : 4;
 		eiter->len = cpu_to_be16(4 + alen);
diff --git a/qla2x00t/qla_isr.c b/qla2x00t/qla_isr.c
index 5b52727ca..e79ae7a96 100644
--- a/qla2x00t/qla_isr.c
+++ b/qla2x00t/qla_isr.c
@@ -1228,12 +1228,8 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
 			    type, sp->handle, comp_status, fw_status[1], fw_status[2],
 			    le16_to_cpu(((struct els_sts_entry_24xx *)
 				pkt)->total_byte_count));
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-			fw_sts_ptr = ((uint8_t*)scsi_req(bsg_job->req)->sense) +
+			fw_sts_ptr = bsg_job_sense(bsg_job) +
 				sizeof(struct fc_bsg_reply);
-#else
-			fw_sts_ptr = ((uint8_t*)bsg_job->req->sense) + sizeof(struct fc_bsg_reply);
-#endif
 			memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
 		}
 		else {
@@ -1250,12 +1246,8 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
 #else
 			bsg_reply->reply_payload_rcv_len = 0;
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-			fw_sts_ptr = ((uint8_t*)scsi_req(bsg_job->req)->sense) +
+			fw_sts_ptr = bsg_job_sense(bsg_job) +
 				sizeof(struct fc_bsg_reply);
-#else
-			fw_sts_ptr = ((uint8_t*)bsg_job->req->sense) + sizeof(struct fc_bsg_reply);
-#endif
 			memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
 		}
 		ql_dump_buffer(ql_dbg_user + ql_dbg_buffer, vha, 0x5056,
diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index c3221eaf0..2ff3ca1e3 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -48,8 +48,8 @@ function add_patch {
     exit 1
   fi
 
-  sed -e "s:^--- [^ ]*:--- orig/linux-${kver}/$2:" \
-      -e "s:^+++ [^ ]*:+++ linux-${kver}/$2:"      \
+  sed -e "s:^--- [^ ]*:--- linux-${kver}/$2:" \
+      -e "s:^+++ [^ ]*:+++ linux-${kver}/$2:" \
       < "$1"
 }
 
@@ -70,8 +70,8 @@ function add_file {
   # -- skip *.mod.c.
   if [ "$1" = "${1%.mod.c}" ] && [ "$1" ]; then
     cat <<EOF
-diff -uprN orig/linux-${kver}/$2 linux-${kver}/$2
---- orig/linux-${kver}/$2
+diff -uprN linux-${kver}/$2 linux-${kver}/$2
+--- linux-${kver}/$2
 +++ linux-${kver}/$2
 @@ -0,0 +1,$(wc -l "$1" | { read -r a b; echo "$a"; echo "$b" >/dev/null; }) @@
 EOF
@@ -94,8 +94,8 @@ EOF
 
 function add_empty_file {
   cat <<EOF
-diff -uprN orig/linux-${kver}/$1 linux-${kver}/$1
---- orig/linux-${kver}/$1
+diff -uprN linux-${kver}/$1 linux-${kver}/$1
+--- linux-${kver}/$1
 +++ linux-${kver}/$1
 @@ -0,0 +1,1 @@
 +
diff --git a/scripts/kernel-functions b/scripts/kernel-functions
index 6e5605c04..b66b368ff 100644
--- a/scripts/kernel-functions
+++ b/scripts/kernel-functions
@@ -5,6 +5,11 @@
 kernel_mirror="http://cdn.kernel.org/pub/linux/kernel"
 kernel_sources="$HOME/software/downloads"
 
+# Whether or not kernel version $1 is lower than or equal kernel version $2.
+function kernel_version_le {
+    awk -v "v1=$1" -v "v2=$2" 'BEGIN { n1 = split(v1, v1a, "."); n2 = split(v2, v2a, "."); for (i=1;;i++) { e1 = i <= n1 ? v1a[i] : 0; e2 = i <= n2 ? v2a[i] : 0; if (e1 < e2 || i >= n1 && i >= n2) exit 0; if (e1 > e2) exit 1; }}'
+}
+
 # Kernel version number.
 function kernel_version {
   if [ "${1#2.}" != "$1" ]; then
diff --git a/scripts/run-regression-tests b/scripts/run-regression-tests
index 53fe20e4f..37a49c37b 100755
--- a/scripts/run-regression-tests
+++ b/scripts/run-regression-tests
@@ -210,7 +210,6 @@ function generate_kernel_patch {
   kver="$(kernel_version "$1")"
   driver_options=(-l)
   [ "${mpt_scst}" = "true" ] && driver_options+=("-m")
-  [ "${qla2x00t}" = "true" ] && driver_options+=("-q")
 
   "${scriptsdir}"/generate-kernel-patch "${driver_options[@]}" "$2" "$1" > "${patchfile}"
 
@@ -343,19 +342,20 @@ function compile_patched_kernel {
   return 0
 }
 
-# Compile subdirectory $2 of the patched kernel tree linux-$1.
+# Compile subdirectories $2..$n of the patched kernel tree linux-$1.
 function compile_kernel {
   local kver plevel
+  local k=$1
   kver="$(kernel_version "$1")"
   plevel="$(patchlevel "$1")"
   local outputfile="${outputdir}/compilation-$1-output.txt"
-  local subdir="$2"
+  shift
 
   echo "Compiling the patched kernel ..."
-  if (cd "${outputdir}/linux-$1" \
+  if (cd "${outputdir}/linux-$k" \
       && make -s prepare \
       && make -s scripts \
-      && LC_ALL=C make -k M="${subdir}"
+      && for subdir; do LC_ALL=C make -k M="${subdir}"; done
      ) &> "${outputfile}"
   then
     local errors warnings
@@ -379,16 +379,16 @@ function run_sparse {
   kver="$(kernel_version "$1")"
   plevel="$(patchlevel "$1")"
   local outputfile="${outputdir}/sparse-$1-output.txt"
-  local subdir="$2"
-  shift
   shift
 
-  echo "Running sparse on the patched kernel in ${subdir} $* ..."
+  echo "Running sparse on the patched kernel in $* ..."
   if (cd "${outputdir}/linux-$k" \
       && make -s prepare \
       && make -s scripts \
       && if grep -q '^CONFIG_PPC=y$' .config; then LC_ALL=C make -k M=arch/powerpc/lib; fi \
-      && LC_ALL=C make -k C=2 CF="-D__CHECK_ENDIAN__ -DCONFIG_SPARSE_RCU_POINTER" M="${subdir}" "$@"
+      && for subdir; do
+	  LC_ALL=C make -k C=2 CF="-D__CHECK_ENDIAN__ -DCONFIG_SPARSE_RCU_POINTER" M="${subdir}"
+      done
     ) &> "${outputfile}"
   then
     local errors warnings
@@ -410,25 +410,26 @@ function run_sparse {
   return 0
 }
 
+# Run smatch for kernel version $1 on directories $2..$n
 function run_smatch {
   local k="$1"
   local kver plevel
   kver="$(kernel_version "$1")"
   plevel="$(patchlevel "$1")"
   local outputfile="${outputdir}/smatch-$1-output.txt"
-  local subdir="$2"
   local disable="CONFIG_DYNAMIC_DEBUG"
   shift
-  shift
 
-  echo "Running smatch on the patched kernel in ${subdir} $* ..."
+  echo "Running smatch on the patched kernel in $* ..."
   if (cd "${outputdir}/linux-$k" &&
       for c in $disable; do sed -i.tmp "s/^$c=y\$/$c=n/" .config; done &&
       make -s oldconfig </dev/null &&
       make -s prepare &&
       make -s scripts &&
       if grep -q '^CONFIG_PPC=y$' .config; then LC_ALL=C make -k M=arch/powerpc/lib; fi &&
-      LC_ALL=C make -k CHECK="smatch -p=kernel" C=2 CF=-D__CHECK_ENDIAN__ M="${subdir}" "$@"
+      for subdir; do
+	LC_ALL=C make -k CHECK="smatch -p=kernel" C=2 CF=-D__CHECK_ENDIAN__ M="${subdir}"
+      done
     ) &> "${outputfile}"
   then
     local errors warnings
@@ -542,7 +543,7 @@ outputdir="${PWD}/regression-test-output-$(date +%Y-%m-%d_%Hh%Mm%Ss)"
 # Driver configuration.
 mpt_scst="false"
 multiple_patches="false"
-qla2x00t="false"
+qla2x00t="true"
 remove_temporary_files_at_end="false"
 run_local_compilation="true"
 quiet_download="false"
@@ -668,8 +669,9 @@ do
     run_checkpatch "$k"
   fi
   patch_and_configure_kernel "$k"
+  subdirs=(drivers/scst)
   if [ "${run_sparse}" = "true" ]; then
-    run_sparse "$k" drivers/scst
+    run_sparse "$k" "${subdirs[@]}"
     mv "${outputdir}/sparse-$k-output.txt" \
        "${outputdir}/sparse-$k-scst-output.txt"
     if [ "${ibmvio}" = "true" ]; then
@@ -685,9 +687,12 @@ do
     fi
   fi
   if [ "${run_smatch}" = "true" ]; then
-    run_smatch "$k" drivers/scst
+    run_smatch "$k" "${subdirs[@]}"
   fi
-  compile_kernel "$k" drivers/scst
+  if [ "${qla2x00t}" = "true" ] && $(kernel_version_le 2.6.37 $k); then
+    subdirs+=(drivers/scsi/qla2xxx)
+  fi
+  compile_kernel "$k" "${subdirs[@]}"
   if [ "${full_check}" = "true" ]; then
     run_headers_check "$k"
     compile_patched_kernel "$k"
diff --git a/scripts/specialize-patch b/scripts/specialize-patch
index be79b2a74..d827d21c4 100755
--- a/scripts/specialize-patch
+++ b/scripts/specialize-patch
@@ -587,7 +587,7 @@ BEGIN {
     config_scst_proc_undefined = 0
 
   # Variable initialization.
-  is_c_source = 0
+  process_file = 0
   reset_hunk_state_variables()
 }
 
@@ -599,10 +599,11 @@ BEGIN {
     # Start of new file.
     dump_lines()
     reset_hunk_state_variables()
-    is_c_source = match(filename[1], "\\.[ch]$") != 0
+    process_file = match(filename[1], "\\.[ch]$") != 0 &&
+      match(filename[1], "drivers/scsi/qla2xxx/") == 0
   }
 
-  if (!is_c_source)
+  if (!process_file)
   {
     print
     next
@@ -647,6 +648,8 @@ BEGIN {
   else if (lines >= 2 && !match(line[lines-2], ":$") &&
            line[lines-1] == "+\x9return;" && $0 == "+}")
   {
+    # Delete "return;" statements at the end of a function that are not
+    # preceded by a label.
     line[lines-1] = $0
     lines_less_added++
   }
diff --git a/scst/include/backport.h b/scst/include/backport.h
index 4d2f691f4..8b25f34db 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -22,13 +22,17 @@
 
 #include <linux/bio.h>
 #include <linux/blkdev.h>	/* struct request_queue */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
+#include <linux/bsg-lib.h>	/* struct bsg_job */
+#endif
 #include <linux/scatterlist.h>	/* struct scatterlist */
 #include <linux/slab.h>		/* kmalloc() */
 #include <linux/timer.h>
 #include <linux/version.h>
 #include <linux/writeback.h>	/* sync_page_range() */
-#include <scsi/scsi_cmnd.h>	/* struct scsi_cmnd */
 #include <rdma/ib_verbs.h>
+#include <scsi/scsi_cmnd.h>	/* struct scsi_cmnd */
+#include <scsi/scsi_transport_fc.h> /* struct fc_bsg_job */
 
 /* <asm-generic/barrier.h> */
 
@@ -90,6 +94,34 @@ static inline unsigned int queue_max_hw_sectors(struct request_queue *q)
 }
 #endif
 
+/* <linux/bsg-lib.h> */
+
+/*
+ * Note: the function bsg_job_sense() exists only in SCST but not in any
+ * upstream kernel.
+ */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) &&		\
+	((LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) &&	\
+	  !defined(CONFIG_SUSE_KERNEL)) ||			\
+	 (LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) &&	\
+	  defined(CONFIG_SUSE_KERNEL)))
+static inline void *bsg_job_sense(struct fc_bsg_job *job)
+{
+	return job->req->sense;
+}
+#else
+static inline void *bsg_job_sense(struct bsg_job *job)
+{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+	return job->req->sense;
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
+	return scsi_req(job->req)->sense;
+#else
+	return scsi_req(blk_mq_rq_from_pdu(job))->sense;
+#endif
+}
+#endif
+
 /* <linux/compiler.h> */
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20)
@@ -717,14 +749,14 @@ struct t10_pi_tuple {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
 #define timer_setup(_timer, _fn, _flags) do {			\
 	init_timer(_timer);					\
-	(_timer)->function = (void (*)(unsigned long))(_fn);	\
+	(_timer)->function = (void *)(_fn);	\
 	(_timer)->data = (unsigned long)(_timer);		\
 	WARN_ON_ONCE((_flags) != 0);				\
 } while (0)
 #elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
 #define timer_setup(_timer, _fn, _flags) do {			\
 	init_timer(_timer);					\
-	(_timer)->function = (void (*)(unsigned long))(_fn);	\
+	(_timer)->function = (void *)(_fn);\
 	(_timer)->data = (unsigned long)(_timer);		\
 	(_timer)->flags = (_flags);				\
 } while (0)
diff --git a/scst/src/Makefile b/scst/src/Makefile
index fd62da9a2..0a7b3f6c4 100644
--- a/scst/src/Makefile
+++ b/scst/src/Makefile
@@ -101,8 +101,8 @@ scst:
 
 # The file Modules.symvers has been renamed in the 2.6.18 kernel to
 # Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Module.symvers ]; then \
-		       echo Module.symvers; else echo Modules.symvers; fi)
+MODULE_SYMVERS:=$(shell if [ -e $(KDIR)/Modules.symvers ]; then \
+		       echo Modules.symvers; else echo Module.symvers; fi)
 
 install: all
 	@if [ -z "$(DESTDIR)" ] && \
diff --git a/srpt/Makefile b/srpt/Makefile
index 0b1399676..449189401 100644
--- a/srpt/Makefile
+++ b/srpt/Makefile
@@ -50,8 +50,8 @@ SRC_FILES=$(wildcard */*.[ch])
 
 # The file Modules.symvers has been renamed in the 2.6.18 kernel to
 # Module.symvers. Find out which name to use by looking in $(KDIR).
-MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Module.symvers" ]; then \
-		       echo Module.symvers; else echo Modules.symvers; fi)
+MODULE_SYMVERS:=$(shell if [ -e "$(KDIR)/Modules.symvers" ]; then \
+		       echo Modules.symvers; else echo Module.symvers; fi)
 
 # Name of the OFED kernel package.
 OFED_KERNEL_IB_RPM:=$(shell for r in mlnx-ofa_kernel compat-rdma kernel-ib; do rpm -q $$r 2>/dev/null | grep -q "^$$r" && echo "$$r" && break; done)