From 9c260ffb60aca1681a3215e6ad3d128d43d8b6d8 Mon Sep 17 00:00:00 2001 From: Yi Zou Date: Tue, 30 Nov 2010 16:18:07 -0800 Subject: [PATCH] --- yaml --- r: 226785 b: refs/heads/master c: 80e736f8a37bebeb5bff18f2aec31caab4104b8b h: refs/heads/master i: 226783: 9d26d2ac3b1fe9137a933cea5be69f910db2e7a2 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/fcoe/fcoe.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3973b4385940..3b25f654ac5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12137f5c28284cc51b5f50932c8d02a5823fcd3c +refs/heads/master: 80e736f8a37bebeb5bff18f2aec31caab4104b8b diff --git a/trunk/drivers/scsi/fcoe/fcoe.c b/trunk/drivers/scsi/fcoe/fcoe.c index d23a538a9dfc..9f9600b67001 100644 --- a/trunk/drivers/scsi/fcoe/fcoe.c +++ b/trunk/drivers/scsi/fcoe/fcoe.c @@ -854,7 +854,6 @@ static void fcoe_if_destroy(struct fc_lport *lport) /* Cleanup the fc_lport */ fc_lport_destroy(lport); - fc_fcp_destroy(lport); /* Stop the transmit retry timer */ del_timer_sync(&port->timer); @@ -876,6 +875,9 @@ static void fcoe_if_destroy(struct fc_lport *lport) fc_remove_host(lport->host); scsi_remove_host(lport->host); + /* Destroy lport scsi_priv */ + fc_fcp_destroy(lport); + /* There are no more rports or I/O, free the EM */ fc_exch_mgr_free(lport);