diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2013-03-01 09:09:51 +0000 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2013-03-01 09:10:08 +0000 |
| commit | 3e34c1fc2b51f117045e4a2472572f14ac91df6e (patch) | |
| tree | 12c7c79931e657483f965bc944861bc8a6a9694d /drivers/scsi/libfc/fc_fcp.c | |
| parent | c157750a901d767ecb95f1dbabd0972dee396b1e (diff) | |
| parent | 1f953b0dbc2549318afcc0a70af5542dffbce34a (diff) | |
[SCSI] Merge tag 'fcoe-02-19-13' into for-linus
FCoE Updates for 3.9
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/libfc/fc_fcp.c')
| -rw-r--r-- | drivers/scsi/libfc/fc_fcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index fcb9d0b20ee4..09c81b2f2169 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c @@ -1381,10 +1381,10 @@ static void fc_fcp_timeout(unsigned long data) fsp->state |= FC_SRB_FCP_PROCESSING_TMO; - if (fsp->state & FC_SRB_RCV_STATUS) - fc_fcp_complete_locked(fsp); - else if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED) + if (rpriv->flags & FC_RP_FLAGS_REC_SUPPORTED) fc_fcp_rec(fsp); + else if (fsp->state & FC_SRB_RCV_STATUS) + fc_fcp_complete_locked(fsp); else fc_fcp_recovery(fsp, FC_TIMED_OUT); fsp->state &= ~FC_SRB_FCP_PROCESSING_TMO; |