From 05f65bfdfa122c40b30245ca92cffa7514eba6e5 Mon Sep 17 00:00:00 2001 From: Eric Moore Date: Thu, 4 Jan 2007 20:44:01 -0700 Subject: [PATCH] --- yaml --- r: 45575 b: refs/heads/master c: 86dd424266530cda55258b2b33d04c23a88b9a9c h: refs/heads/master i: 45573: 686a3751c5d3236b914b88f68d72acd268910c38 45571: 94fe55e7baa40405f13a6119dd0407759d5a1e9c 45567: 7e365dd9da39b728c06fca40bcaba3b5cb47daf0 v: v3 --- [refs] | 2 +- trunk/drivers/message/fusion/mptscsih.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6d3e56912dc3..6f7f53dc5e2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d6d174a0888fe082e87ce1d4a0f1a85044a4515 +refs/heads/master: 86dd424266530cda55258b2b33d04c23a88b9a9c diff --git a/trunk/drivers/message/fusion/mptscsih.c b/trunk/drivers/message/fusion/mptscsih.c index 2c72c36b8171..076eb2b573a3 100644 --- a/trunk/drivers/message/fusion/mptscsih.c +++ b/trunk/drivers/message/fusion/mptscsih.c @@ -701,6 +701,17 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr) break; } } + } else if (ioc->bus_type == FC) { + /* + * The FC IOC may kill a request for variety of + * reasons, some of which may be recovered by a + * retry, some which are unlikely to be + * recovered. Return DID_ERROR instead of + * DID_RESET to permit retry of the command, + * just not an infinite number of them + */ + sc->result = DID_ERROR << 16; + break; } /*