[SCSI] fcoe: stop delivery of received frames before doing lport_destroy()

[safe/jmp/linux-2.6] / drivers / scsi / fcoe / fcoe.c

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 8160126..14a4017 100644 (file)
--- a/drivers/scsi/fcoe/fcoe.c
+++ b/drivers/scsi/fcoe/fcoe.c
@@ -466,6 +466,9 @@ static int fcoe_if_destroy(struct net_device *netdev)
        /* tear-down the FCoE controller */
        fcoe_ctlr_destroy(&fc->ctlr);
 
+       /* Free queued packets for the per-CPU receive threads */
+       fcoe_percpu_clean(lp);
+
        /* Cleanup the fc_lport */
        fc_lport_destroy(lp);
        fc_fcp_destroy(lp);
@@ -478,9 +481,6 @@ static int fcoe_if_destroy(struct net_device *netdev)
        if (lp->emp)
                fc_exch_mgr_free(lp->emp);
 
-       /* Free the per-CPU receive threads */
-       fcoe_percpu_clean(lp);
-
        /* Free existing skbs */
        fcoe_clean_pending_queue(lp);