From 290348e5e95c7901194a070209738ed94edc3782 Mon Sep 17 00:00:00 2001
From: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Date: Thu, 10 Jan 2013 23:59:38 -0800
Subject: [PATCH] --- yaml --- r: 359443 b: refs/heads/master c:
 50b7186f64d525c1054d996f83e16c200f0b321c h: refs/heads/master i:   359441:
 a6b24d8160731358412d3d66f3b35c5bc2d0943d   359439:
 8a3ee9dc00bd022a4fdff6a70afbf81384aff4fe v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 525243923898..7e8f177cf50a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33c7da0590d4e9e7420f8cf50722c4fe6932218f
+refs/heads/master: 50b7186f64d525c1054d996f83e16c200f0b321c
diff --git a/trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c b/trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c
index b9d0d9cb17f9..eba2328f60e7 100644
--- a/trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c
+++ b/trunk/drivers/scsi/bnx2fc/bnx2fc_tgt.c
@@ -381,7 +381,9 @@ static int bnx2fc_init_tgt(struct bnx2fc_rport *tgt,
 	tgt->rq_cons_idx = 0;
 	atomic_set(&tgt->num_active_ios, 0);
 
-	if (rdata->flags & FC_RP_FLAGS_RETRY) {
+	if (rdata->flags & FC_RP_FLAGS_RETRY &&
+	    rdata->ids.roles & FC_RPORT_ROLE_FCP_TARGET &&
+	    !(rdata->ids.roles & FC_RPORT_ROLE_FCP_INITIATOR)) {
 		tgt->dev_type = TYPE_TAPE;
 		tgt->io_timeout = 0; /* use default ULP timeout */
 	} else {