From e0075008efe7d16f034212b3b165a55db1a59f6b Mon Sep 17 00:00:00 2001 From: Jesse Brandeburg Date: Tue, 8 Jul 2008 15:51:27 -0700 Subject: [PATCH] --- yaml --- r: 103475 b: refs/heads/master c: 72ab51954d108e4999b3c958ae21da731d2d789a h: refs/heads/master i: 103473: 8ba8ae007b1c6a5a6234e8eb473b29e9cd2a6f0c 103471: 6484ab22a9424ea0ddf8cc70b958e918631d30dd v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 73fdae58082a..18ac3e1cff7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3dc3da02a7c29237ca4ce3ec17f0e1f87ff0a06 +refs/heads/master: 72ab51954d108e4999b3c958ae21da731d2d789a diff --git a/trunk/drivers/net/ixgb/ixgb_main.c b/trunk/drivers/net/ixgb/ixgb_main.c index ec8bce154364..60cad65dbc2e 100644 --- a/trunk/drivers/net/ixgb/ixgb_main.c +++ b/trunk/drivers/net/ixgb/ixgb_main.c @@ -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;