|
@@ -2207,7 +2207,7 @@ int fnic_reset(struct Scsi_Host *shost)
|
|
|
{
|
|
|
struct fc_lport *lp;
|
|
|
struct fnic *fnic;
|
|
|
- int ret = SUCCESS;
|
|
|
+ int ret = 0;
|
|
|
|
|
|
lp = shost_priv(shost);
|
|
|
fnic = lport_priv(lp);
|
|
@@ -2219,12 +2219,11 @@ int fnic_reset(struct Scsi_Host *shost)
|
|
|
* Reset local port, this will clean up libFC exchanges,
|
|
|
* reset remote port sessions, and if link is up, begin flogi
|
|
|
*/
|
|
|
- if (lp->tt.lport_reset(lp))
|
|
|
- ret = FAILED;
|
|
|
+ ret = lp->tt.lport_reset(lp);
|
|
|
|
|
|
FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
|
|
|
"Returning from fnic reset %s\n",
|
|
|
- (ret == SUCCESS) ?
|
|
|
+ (ret == 0) ?
|
|
|
"SUCCESS" : "FAILED");
|
|
|
|
|
|
return ret;
|
|
@@ -2251,7 +2250,7 @@ int fnic_host_reset(struct scsi_cmnd *sc)
|
|
|
* scsi-ml tries to send a TUR to every device if host reset is
|
|
|
* successful, so before returning to scsi, fabric should be up
|
|
|
*/
|
|
|
- ret = fnic_reset(shost);
|
|
|
+ ret = (fnic_reset(shost) == 0) ? SUCCESS : FAILED;
|
|
|
if (ret == SUCCESS) {
|
|
|
wait_host_tmo = jiffies + FNIC_HOST_RESET_SETTLE_TIME * HZ;
|
|
|
ret = FAILED;
|