]> err.no Git - linux-2.6/commitdiff
ixgb: check down state before enable irq
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Tue, 8 Jul 2008 22:51:27 +0000 (15:51 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Fri, 11 Jul 2008 05:20:27 +0000 (01:20 -0400)
in order to prevent the case where poll_disable is waiting
on our device to permanently, check the flag to make sure we're not
down or closing down before re-enabling interrupts.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/ixgb/ixgb_main.c

index ec8bce1543649bac6d5c63fa3187409e4140e760..60cad65dbc2e859ffd6be91aaa152cbfb805fcef 100644 (file)
@@ -1782,7 +1782,8 @@ ixgb_clean(struct napi_struct *napi, int budget)
        /* If budget not fully consumed, exit the polling mode */
        if (work_done < budget) {
                netif_rx_complete(netdev, napi);
-               ixgb_irq_enable(adapter);
+               if (!test_bit(__IXGB_DOWN, &adapter->flags))
+                       ixgb_irq_enable(adapter);
        }
 
        return work_done;