| Message ID | 1310729306-12190-1-git-send-email-Michael.Thalmeier@sigmatek.at |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Michael Thalmeier <Michael.Thalmeier@sigmatek.at> Date: Fri, 15 Jul 2011 13:28:26 +0200 > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 200a363..0ffec46 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 */
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> --- drivers/net/r6040.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)