From 3f51f50779c17cbd4b9b361fe5b10dd8b23f682d Mon Sep 17 00:00:00 2001 From: Joe Eykholt Date: Wed, 29 Jul 2009 17:04:33 -0700 Subject: [PATCH] --- yaml --- r: 161019 b: refs/heads/master c: e9ba8b427852937caee6ca39bb6f9a893bb32ae1 h: refs/heads/master i: 161017: b1e6681e0566d1b9d7cd1a3fb52afe9c3e2d23e5 161015: 8985fd535445eee66de6cc0a6637e4eebd2ce56d v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libfc/fc_lport.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a7fc953f39d7..4f522ca9a3f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1190d925813aab80d17ff10f26c115f5846b3308 +refs/heads/master: e9ba8b427852937caee6ca39bb6f9a893bb32ae1 diff --git a/trunk/drivers/scsi/libfc/fc_lport.c b/trunk/drivers/scsi/libfc/fc_lport.c index 7bb451ab0b87..a430335ebf59 100644 --- a/trunk/drivers/scsi/libfc/fc_lport.c +++ b/trunk/drivers/scsi/libfc/fc_lport.c @@ -643,6 +643,7 @@ int fc_lport_destroy(struct fc_lport *lport) mutex_unlock(&lport->lp_mutex); lport->tt.fcp_abort_io(lport); + lport->tt.disc_stop_final(lport); lport->tt.exch_mgr_reset(lport, 0, 0); return 0; } @@ -844,7 +845,10 @@ static void fc_lport_recv_req(struct fc_lport *lport, struct fc_seq *sp, * RSCN here. These don't require a session. * Even if we had a session, it might not be ready. */ - if (fh->fh_type == FC_TYPE_ELS && fh->fh_r_ctl == FC_RCTL_ELS_REQ) { + if (!lport->link_up) + fc_frame_free(fp); + else if (fh->fh_type == FC_TYPE_ELS && + fh->fh_r_ctl == FC_RCTL_ELS_REQ) { /* * Check opcode. */