bnx2x: Calling napi_del
authorEilon Greenstein <eilong@broadcom.com>
Thu, 22 Jan 2009 06:01:25 +0000 (06:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Jan 2009 21:47:11 +0000 (13:47 -0800)
rmmod might hang without this patch since the reference counter is not going
down

Signed-off-by: Yitchak Gertner <gertner@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bnx2x_main.c

index fbd71659cca6a61d5a356820c67f01ae37758dd0..71fbf2dbda3b816258fcd4d80bdfbdd897cf3bab 100644 (file)
@@ -6547,6 +6547,8 @@ load_error2:
        bnx2x_free_irq(bp);
 load_error1:
        bnx2x_napi_disable(bp);
+       for_each_queue(bp, i)
+               netif_napi_del(&bnx2x_fp(bp, i, napi));
        bnx2x_free_mem(bp);
 
        /* TBD we really need to reset the chip
@@ -6855,6 +6857,8 @@ unload_error:
        bnx2x_free_skbs(bp);
        for_each_queue(bp, i)
                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
+       for_each_queue(bp, i)
+               netif_napi_del(&bnx2x_fp(bp, i, napi));
        bnx2x_free_mem(bp);
 
        bp->state = BNX2X_STATE_CLOSED;
@@ -10481,6 +10485,8 @@ static int bnx2x_eeh_nic_unload(struct bnx2x *bp)
        bnx2x_free_skbs(bp);
        for_each_queue(bp, i)
                bnx2x_free_rx_sge_range(bp, bp->fp + i, NUM_RX_SGE);
+       for_each_queue(bp, i)
+               netif_napi_del(&bnx2x_fp(bp, i, napi));
        bnx2x_free_mem(bp);
 
        bp->state = BNX2X_STATE_CLOSED;