summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorAlexander Duyck2012-02-08 08:49:54 +0100
committerJeff Kirsher2012-03-13 04:34:30 +0100
commitb9f6ed2bab0b087bdff870b7173f1d89efd96e54 (patch)
treeeec35fdb1ae69f0de4057ad48017766b9d1ff728 /drivers/net/ethernet/intel
parentixgbe: Default to queue pairs when number of queues is less than CPUs (diff)
downloadkernel-qcow2-linux-b9f6ed2bab0b087bdff870b7173f1d89efd96e54.tar.gz
kernel-qcow2-linux-b9f6ed2bab0b087bdff870b7173f1d89efd96e54.tar.xz
kernel-qcow2-linux-b9f6ed2bab0b087bdff870b7173f1d89efd96e54.zip
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')
-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)
ixgbe_check_fan_failure(adapter, eicr);
- if (napi_schedule_prep(&(q_vector->napi))) {
- /* would disable interrupts here but EIAM disabled it */
- __napi_schedule(&(q_vector->napi));
- }
+ /* would disable interrupts here but EIAM disabled it */
+ napi_schedule(&q_vector->napi);
/*
* re-enable link(maybe) and non-queue interrupts, no flush.
* ixgbe_poll will re-enable the queue interrupts
*/
-
if (!test_bit(__IXGBE_DOWN, &adapter->state))
ixgbe_irq_enable(adapter, false, false);