diff options
| author | Michael Thalmeier <Michael.Thalmeier@sigmatek.at> | 2011-07-15 01:28:26 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-15 08:10:33 -0700 |
| commit | 0d9b6e738a22244d38def847a24e5ee6fcedd898 (patch) | |
| tree | 21ca5f7bc9713f2e1d7caad7758e2d0e245a7bc5 /drivers | |
| parent | 62f2a3a48bdc99822a24356e667e52c30df287c9 (diff) | |
r6040: only disable RX interrupt if napi_schedule_prep is successful
When receiving the first RX interrupt before the internal call
to napi_schedule_prep is successful the RX interrupt gets disabled
and is never enabled again as the poll function never gets executed.
Signed-off-by: Michael Thalmeier <Michael.Thalmeier@sigmatek.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/r6040.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 200a363c3bf..0ffec460844 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -677,9 +677,11 @@ static irqreturn_t r6040_interrupt(int irq, void *dev_id) if (status & RX_FIFO_FULL) dev->stats.rx_fifo_errors++; - /* Mask off RX interrupt */ - misr &= ~RX_INTS; - napi_schedule(&lp->napi); + if (likely(napi_schedule_prep(&lp->napi))) { + /* Mask off RX interrupt */ + misr &= ~RX_INTS; + __napi_schedule(&lp->napi); + } } /* TX interrupt request */ |