aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2012-02-08 02:49:54 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-03-12 23:34:30 -0400
commitb9f6ed2bab0b087bdff870b7173f1d89efd96e54 (patch)
treeeec35fdb1ae69f0de4057ad48017766b9d1ff728 /drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
parent8f15486dd0f6e8423cb33fa8513ed9d074476471 (diff)
ixgbe: Drop unnecessary napi_schedule_prep and spare blank line from ixgbe_intr
This patch is a minor cleanup to address the unnecessary use of napi_schedule_prep in ixgbe_intr and to also remove a blank line that is not needed since it is separating a comment from the line it is explaining. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Tested-by: Stephen Ko <stephen.s.ko@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_main.c')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 80ae91902aab..b1f53eda8e3f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -2401,16 +2401,13 @@ static irqreturn_t ixgbe_intr(int irq, void *data)
2401 2401
2402 ixgbe_check_fan_failure(adapter, eicr); 2402 ixgbe_check_fan_failure(adapter, eicr);
2403 2403
2404 if (napi_schedule_prep(&(q_vector->napi))) { 2404 /* would disable interrupts here but EIAM disabled it */
2405 /* would disable interrupts here but EIAM disabled it */ 2405 napi_schedule(&q_vector->napi);
2406 __napi_schedule(&(q_vector->napi));
2407 }
2408 2406
2409 /* 2407 /*
2410 * re-enable link(maybe) and non-queue interrupts, no flush. 2408 * re-enable link(maybe) and non-queue interrupts, no flush.
2411 * ixgbe_poll will re-enable the queue interrupts 2409 * ixgbe_poll will re-enable the queue interrupts
2412 */ 2410 */
2413
2414 if (!test_bit(__IXGBE_DOWN, &adapter->state)) 2411 if (!test_bit(__IXGBE_DOWN, &adapter->state))
2415 ixgbe_irq_enable(adapter, false, false); 2412 ixgbe_irq_enable(adapter, false, false);
2416 2413